New unified makefile architecture

[virtualjaguar] / Makefile.win32

diff --git a/Makefile.win32 b/Makefile.win32
index 299860c759a93401f8406d092add0d081fda2568..ebcc4d05f4d1dd0acee7288fd672fb947d5f0678 100644 (file)
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -7,26 +7,29 @@
 SYSTYPE   = __GCCWIN32__
 EXESUFFIX = .exe
 GLLIB     = opengl32
+ICON      = vj-ico.o
 
 # Uncomment the following lines to compile for *nix
 
 #SYSTYPE   = __GCCUNIX__
 #EXESUFFIX =
 #GLLIB     = GL
+#ICON      =
 
-CC        = gcc
-LD        = gcc
-TARGET    = vj
+CC         = gcc
+LD         = gcc
+TARGET     = vj
 
-CFLAGS  = -Wall -Wno-switch -O3 -D$(SYSTYPE) -Dstricmp="strcasecmp" \
-                       -fomit-frame-pointer `sdl-config --cflags`
-#                      -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
+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)
 
@@ -59,7 +62,8 @@ OBJS = \
        obj/unzip.o \
        obj/version.o \
        obj/video.o \
-       obj/vj.o
+       obj/vj.o \
+       $(ICON)
 
 all: obj $(TARGET)
 
@@ -78,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