New unified makefile architecture

[virtualjaguar] / Makefile.win32

diff --git a/Makefile.win32 b/Makefile.win32
index 8f56e4a5f3ba6ef5c958dc2339f854e31c973237..ebcc4d05f4d1dd0acee7288fd672fb947d5f0678 100644 (file)
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -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,7 +82,7 @@ obj/%.o: src/%.cpp
 
 vj: $(OBJS)
        $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-       strip --strip-all vj$(EXESUFFIX)
+#      strip --strip-all vj$(EXESUFFIX)
 #      upx -9 vj$(EXESUFFIX)
 
 # Other stuff that has unusual dependencies