X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.win32;h=299860c759a93401f8406d092add0d081fda2568;hb=96f7121f5499861e69cf042e408a3db133a5b1d0;hp=f3d1b8f9eaf5ed993c2a1718b38d10fb4cdab901;hpb=0681447e9e68ddb46625ffd25d35bf3b6e8be71f;p=virtualjaguar

diff --git a/Makefile.win32 b/Makefile.win32
index f3d1b8f..299860c 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -1,16 +1,34 @@
-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
+
+# Uncomment the following lines to compile for *nix
+
+#SYSTYPE   = __GCCUNIX__
+#EXESUFFIX =
+#GLLIB     = GL
+
+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
-#			-fomit-frame-pointer `sdl-config --cflags` -DTOM_DEBUG
 
 LDFLAGS = $(CFLAGS)
 
-TARGET = vj
+LIBS = -L/usr/local/lib `sdl-config --libs` -lstdc++ -lz -l$(GLLIB)
+
+INCS = -I. -Isrc -Isrc/include -I/usr/local/include
+
+THECC = $(CC) $(CFLAGS) $(INCS)
 
 OBJS = \
 	obj/anajoy.o \
@@ -34,18 +52,14 @@ OBJS = \
 	obj/m68kdasm.o \
 	obj/memory.o \
 	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/m68kdasmAG.o \
-#	obj/gpu2.o \
-
-LIBS = -L/usr/local/lib `sdl-config --libs` -lstdc++ -lz
-
-INCS = -I. -Isrc -Isrc/include -I/usr/local/include `sdl-config --cflags`
-
-THECC = $(CC) $(CFLAGS) $(INCS)
 
 all: obj $(TARGET)
 
@@ -78,16 +92,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