New unified makefile architecture

[virtualjaguar] / Makefile.unix

diff --git a/Makefile.unix b/Makefile.unix
index 2a774255087ea6f782c71f67d14cddac4c531c01..e5bb302c2656337a87c18f79196d50b327ed94c5 100644 (file)
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -20,15 +20,16 @@ CC        = gcc
 LD        = gcc
 TARGET    = vj
 
-CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O3 -D$(SYSTYPE) -Dstricmp="strcasecmp" \
+CFLAGS = -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) -Dstricmp="strcasecmp" \
                -fomit-frame-pointer `sdl-config --cflags`
+#              -fomit-frame-pointer `sdl-config --cflags` -g
 #              -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
 
 LDFLAGS = $(CFLAGS)
 
-LIBS = -L/usr/local/lib `sdl-config --libs` -lstdc++ -lz -l$(GLLIB)
+LIBS = -L/usr/local/lib -L/usr/lib `sdl-config --libs` -lstdc++ -lz -l$(GLLIB)
 
-INCS = -I. -Isrc -Isrc/include -I/usr/local/include
+INCS = -I. -Isrc -Isrc/include -I/usr/local/include -I/usr/include
 
 THECC = $(CC) $(CFLAGS) $(INCS)
 
@@ -81,6 +82,7 @@ obj/%.o: src/%.cpp
 
 vj: $(OBJS)
        $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+#      strip --strip-all vj$(EXESUFFIX)
 #      upx -9 vj$(EXESUFFIX)
 
 # Other stuff that has unusual dependencies