X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.unix;h=1471ee0a3b2058df5e240b65d298e0cded5395a7;hb=99022b1729761292b036c382934b73e62f06923b;hp=847f9da88e3b201b51695616e0f139361721c8ee;hpb=caf4f77c6fe5f5c2d28fe5fff094f8e9ff7e601a;p=virtualjaguar

diff --git a/Makefile.unix b/Makefile.unix
index 847f9da..1471ee0 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -1,16 +1,33 @@
-CC        = gcc
-LD        = gcc
+#
+# Makefile for Virtual Jaguar GCC/SDL Portable Jaguar Emulator
+#
+
+# Uncomment the following lines to compile for Win32
+
+#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 -lopengl32
+LIBS = -L/usr/local/lib `sdl-config --libs` -lstdc++ -lz -l$(GLLIB)
 
 INCS = -I. -Isrc -Isrc/include -I/usr/local/include
 
@@ -40,11 +57,13 @@ OBJS = \
 	obj/objectp.o \
 	obj/sdlemu_config.o \
 	obj/sdlemu_opengl.o \
+	obj/settings.o \
 	obj/tom.o \
 	obj/unzip.o \
 	obj/version.o \
 	obj/video.o \
-	obj/vj.o
+	obj/vj.o \
+	$(ICON)
 
 all: obj $(TARGET)
 
@@ -63,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
@@ -77,16 +97,16 @@ obj/gui.o: src/gui.cpp src/include/gui.h src/include/font1.h
 obj/m68kcpu.o: obj/m68kops.h src/m68k.h src/m68kconf.h
 	$(CC) $(CFLAGS) -Iobj -c src/m68kcpu.c -o obj/m68kcpu.o
 
-obj/m68kops.o: obj/m68kmake.exe obj/m68kops.h obj/m68kops.c src/m68k.h src/m68kconf.h
+obj/m68kops.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kops.c src/m68k.h src/m68kconf.h
 	$(CC) $(CFLAGS) -Isrc -c obj/m68kops.c -o obj/m68kops.o
 
-obj/m68kopac.o: obj/m68kmake.exe obj/m68kops.h obj/m68kopac.c src/m68k.h src/m68kconf.h
+obj/m68kopac.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopac.c src/m68k.h src/m68kconf.h
 	$(CC) $(CFLAGS) -Isrc -c obj/m68kopac.c -o obj/m68kopac.o
 
-obj/m68kopdm.o: obj/m68kmake.exe obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kconf.h
+obj/m68kopdm.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kconf.h
 	$(CC) $(CFLAGS) -Isrc -c obj/m68kopdm.c -o obj/m68kopdm.o
 
-obj/m68kopnz.o: obj/m68kmake.exe obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h
+obj/m68kopnz.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h
 	$(CC) $(CFLAGS) -Isrc -c obj/m68kopnz.c -o obj/m68kopnz.o
 
 obj/m68kdasm.o: src/m68kdasm.c src/m68k.h src/m68kconf.h