X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.unix;h=e5bb302c2656337a87c18f79196d50b327ed94c5;hb=cf2ca159d3c52d318c0d4a166373dbe626a108e1;hp=1237bae9f11115ede6a01bca56ad4ed51d91b0af;hpb=99cd4cb4bae63ed6608408045a81ca5d11d6e5ad;p=virtualjaguar

diff --git a/Makefile.unix b/Makefile.unix
index 1237bae..e5bb302 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -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
 
-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