X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=db3cb97fb19d34cdcae3febce493897e5ef58247;hb=refs%2Fheads%2Foctaneport;hp=105f3528a90b6b785f5f168c440940ed83853b34;hpb=f92b151d6e1c67cf0bdccf4777e2460d99b5e222;p=summerhack

diff --git a/Makefile b/Makefile
index 105f352..db3cb97 100644
--- a/Makefile
+++ b/Makefile
@@ -2,16 +2,17 @@ src = src/sumhack.cpp src/events.cpp
 bin = sumhack-thelab
 
 include src/parts/Makefile-part
-include src/sdlvf/Makefile-part
+#include src/sdlvf/Makefile-part
 
 obj = $(src:.cpp=.o) $(csrc:.c=.o)
 
-opt = -O1
-opt = -g
+opt = -O3
+dbg = -g
+def = -DNO_MUSIC
 incdir = -Isrc/3dengfx/src -Ilibs -Ilibs/png -Ilibs/jpeglib -Ilibs/ogg -Ilibs/vorbis
-CXXFLAGS = -ansi -pedantic -Wall $(opt) $(incdir) -MMD `sdl-config --cflags`
-CFLAGS = -std=c89 -pedantic -Wall $(opt) $(incdir) -MMD `sdl-config --cflags`
-libs = $(libdir) $(libsys) src/3dengfx/lib3dengfx.a `sdl-config --libs` $(libgl) \
+CXXFLAGS = -ansi -pedantic -Wall $(opt) $(dbg) $(incdir) -MMD $(def)
+CFLAGS = -std=c89 -pedantic -Wall $(opt) $(dbg) $(incdir) -MMD $(def)
+libs = $(libdir) $(libsys) src/3dengfx/lib3dengfx.a $(libgl) \
 	   -lvorbis -logg -ljpeg -lpng -lz -l3ds $(libc)
 
 sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/')
@@ -19,13 +20,13 @@ ifeq ($(sys), mingw)
 	obj = $(src:.cpp=.w32.o) $(csrc:.c=.w32.o)
 	bin = sumhack-thelab.exe
 	libdir = -Llibs/w32
-	libgl = -lopengl32
+	libgl = -lopengl32 -lglut32
 	libsys = -lmingw32 -lgdi32 -mconsole
 	libc = -lm
 
 else
 	libdir = -Llibs
-	libgl = -lGL
+	libgl = -lGL -lglut
 	libc = -lm
 endif