Move opengl code from libsdl to libopengl

diff --git a/.gitignore b/.gitignore
index 0afa595..7d89b66 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ src/libcpu/m68kmake
 src/libframerate/libframerate.a
 src/libglew/libglew.a
 src/libsdl/libsdl.a
+src/libopengl/libopengl.a
 src/libovr/libovr.a
 src/libvideo/libvideo.a
 src/libsound/libsound.a

diff --git a/configure.ac b/configure.ac
index ba0a746..31b0527 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,7 @@ AC_OUTPUT(
     src/libkeyboard/Makefile
     src/libdisk/Makefile
     src/libsdl/Makefile
+    src/libopengl/Makefile
     src/libglew/Makefile
     src/libovr/Makefile
     src/libtext/Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index c695a08..9709e1b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,8 @@ SUBDIRS = \
        libdisk \
        libsound \
        libtext \
-       libglew
+       libglew \
+       libopengl
 
 if HAVE_SDL2
 SUBDIRS += \

diff --git a/src/libsdl/opengl.c b/src/libopengl/opengl.c
similarity index 99%
rename from src/libsdl/opengl.c
rename to src/libopengl/opengl.c
index 83ec683..6bb8e9a 100644 (file)
--- a/src/libsdl/opengl.c
+++ b/src/libopengl/opengl.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <math.h>
 #include <errno.h>
-#include "print.h"
+#include "../libsdl/print.h"
 #include "opengl.h"
 #define GL3_PROTOTYPES 1
 #include <GL/glew.h>

diff --git a/src/libsdl/opengl.h b/src/libopengl/opengl.h
similarity index 100%
rename from src/libsdl/opengl.h
rename to src/libopengl/opengl.h

diff --git a/src/libsdl/Makefile.am b/src/libsdl/Makefile.am
index 3472198..e932bd1 100644 (file)
--- a/src/libsdl/Makefile.am
+++ b/src/libsdl/Makefile.am
@@ -4,6 +4,5 @@ noinst_LIBRARIES = libsdl.a
 
 libsdl_a_SOURCES = \
        sdl.c \
-       opengl.c \
        print.c
 

diff --git a/src/libsdl/sdl.c b/src/libsdl/sdl.c
index 29344cd..079b1a8 100644 (file)
--- a/src/libsdl/sdl.c
+++ b/src/libsdl/sdl.c
@@ -23,7 +23,6 @@
 #include "print.h"
 #include "../../include/keycodes.h"
 #include "sdl.h"
-#include "opengl.h"
 
 #include <SDL2/SDL.h>
 #define GL3_PROTOTYPES 1

diff --git a/src/mercenary/Makefile.am b/src/mercenary/Makefile.am
index 5bf2464..1dc78ae 100644 (file)
--- a/src/mercenary/Makefile.am
+++ b/src/mercenary/Makefile.am
@@ -26,6 +26,7 @@ mercenary2_LDADD = \
        $(top_builddir)/src/libdisk/libdisk.a \
        $(top_builddir)/src/libkeyboard/libkeyboard.a \
        $(top_builddir)/src/libsdl/libsdl.a \
+       $(top_builddir)/src/libopengl/libopengl.a \
        $(SDL2_LIBS)
 
 mercenary3_SOURCES = \
@@ -45,6 +46,7 @@ mercenary3_LDADD = \
        $(top_builddir)/src/libdisk/libdisk.a \
        $(top_builddir)/src/libkeyboard/libkeyboard.a \
        $(top_builddir)/src/libsdl/libsdl.a \
+       $(top_builddir)/src/libopengl/libopengl.a \
        $(SDL2_LIBS)
 
 if HAVE_OVR

diff --git a/src/mercenary/main.c b/src/mercenary/main.c
index 260fd6f..f0b464b 100644 (file)
--- a/src/mercenary/main.c
+++ b/src/mercenary/main.c
@@ -30,7 +30,7 @@
 #include "../libovr/ovr.h"
 #include "../libovr/keyboard.h"
 #endif
-#include "../libsdl/opengl.h"
+#include "../libopengl/opengl.h"
 #include "../libsdl/print.h"
 #include "../libcpu/m68k.h"
 #include "../libcpu/execute.h"

diff --git a/src/mercenary/render.c b/src/mercenary/render.c
index 31190ea..adc1dc8 100644 (file)
--- a/src/mercenary/render.c
+++ b/src/mercenary/render.c
@@ -42,7 +42,7 @@
 #include "../libcpu/m68k.h"
 #include "../libcpu/m68kcpu.h"
 #include "../libcpu/execute.h"
-#include "../libsdl/opengl.h"
+#include "../libopengl/opengl.h"
 #include "mercenary.h"
 
 #define GL3_PROTOTYPES 1