Converted to SDL 2, added fullscreen support (F12 to toggle).

[stargem2] / Makefile

diff --git a/Makefile b/Makefile
index 65dc220089f3d503b8b613ab2522c03f1eef0739..a7e1ea3daee32d9fd4dbde7bddf9939b058db0f4 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -10,18 +10,15 @@ ifeq "$(OSTYPE)" "msys"                                                     # Win32
 
 SYSTYPE    = __GCCWIN32__
 EXESUFFIX  = .exe
-GLLIB      = -lopengl32
 ICON       = obj/icon.o
 SDLLIBTYPE = --libs
 MSG        = Win32 on MinGW
 
 else
-#ifeq "$(OSTYPE)" "darwin"
 ifeq "darwin" "$(findstring darwin,$(OSTYPE))" # Should catch both 'darwin' and 'darwin7.0'
 
 SYSTYPE    = __GCCUNIX__ -D_OSX_
 EXESUFFIX  =
-GLLIB      =
 ICON       =
 SDLLIBTYPE = --static-libs
 MSG        = Mac OS X
@@ -30,7 +27,6 @@ else                                                                                  # *nix
 
 SYSTYPE    = __GCCUNIX__
 EXESUFFIX  =
-GLLIB      = -lGL
 ICON       =
 SDLLIBTYPE = --libs
 MSG        = generic Unix/Linux
@@ -42,15 +38,15 @@ CC         = gcc
 LD         = gcc
 TARGET     = stargem2
 
-CFLAGS   = -MMD -Wall -Wno-switch -Wno-uninitialized -Wno-unused -O2 -D$(SYSTYPE) -fomit-frame-pointer `sdl-config --cflags`
+CFLAGS   = -MMD -Wall -Wno-switch -Wno-uninitialized -Wno-unused -O2 -D$(SYSTYPE) -fomit-frame-pointer `sdl2-config --cflags`
 CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -Wno-uninitialized -Wno-unused -O2 -D$(SYSTYPE) \
-               -fomit-frame-pointer `sdl-config --cflags` \
+               -fomit-frame-pointer `sdl2-config --cflags` \
                -g
 #              -DLOG_UNMAPPED_MEMORY_ACCESSES
 
 LDFLAGS =
 
-LIBS = -L/usr/local/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
+LIBS = -L/usr/local/lib `sdl2-config $(SDLLIBTYPE)` -lstdc++ -lz
 
 INCS = -I. -Isrc -I/usr/local/include
 
@@ -64,7 +60,6 @@ OBJS = \
        obj/settings.o      \
        obj/sound.o         \
        obj/sdlemu_config.o \
-       obj/sdlemu_opengl.o \
        obj/timing.o        \
        obj/stargem2.o      \
        $(ICON)
@@ -131,3 +126,4 @@ $(TARGET)$(EXESUFFIX): $(OBJS)
 # The "-" in front in there just in case they haven't been created yet
 
 -include obj/*.d
+