X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=5df0a739f09078de765b2e2a2d622e1818a136f1;hb=836c7fa1f3e2dc3ec9849cac2584d4544bf2fba4;hp=3746100cbe479fdc36c5f6f283e3277114600e9a;hpb=34eb947551354f437ed67e2f0a3b88e186f47561;p=virtualjaguar

diff --git a/Makefile b/Makefile
index 3746100..5df0a73 100644
--- a/Makefile
+++ b/Makefile
@@ -62,30 +62,33 @@ LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLL
 # Also, remove the "-DHAVE_LIB_CDIO" from CPPFLAGS above.
 #LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
 
-INCS = -I. -I./src -I/usr/local/include -I/usr/include
+INCS = -I. -I./src -I./src/gui -I/usr/local/include -I/usr/include
 
 OBJS = \
+	obj/m68kcpu.o       \
+	obj/m68kops.o       \
+	obj/m68kopac.o      \
+	obj/m68kopdm.o      \
+	obj/m68kopnz.o      \
+	obj/m68kdasm.o      \
+\
+	obj/gui.o           \
+\
 	obj/blitter.o       \
 	obj/cdrom.o         \
 	obj/cdintf.o        \
-	obj/clock.o         \
 	obj/crc32.o         \
 	obj/dac.o           \
 	obj/dsp.o           \
 	obj/eeprom.o        \
+	obj/event.o         \
+	obj/file.o          \
 	obj/gpu.o           \
-	obj/gui.o           \
 	obj/jagdasm.o       \
 	obj/jaguar.o        \
 	obj/jerry.o         \
 	obj/joystick.o      \
 	obj/log.o           \
-	obj/m68kcpu.o       \
-	obj/m68kops.o       \
-	obj/m68kopac.o      \
-	obj/m68kopdm.o      \
-	obj/m68kopnz.o      \
-	obj/m68kdasm.o      \
 	obj/memory.o        \
 	obj/objectp.o       \
 	obj/sdlemu_config.o \
@@ -93,7 +96,6 @@ OBJS = \
 	obj/settings.o      \
 	obj/tom.o           \
 	obj/unzip.o         \
-	obj/version.o       \
 	obj/video.o         \
 	obj/vj.o            \
 	$(ICON)
@@ -151,6 +153,10 @@ obj/%.o: src/%.cpp
 	@echo "*** Compiling $<..."
 	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
 
+obj/%.o: src/gui/%.cpp
+	@echo "*** Compiling $<..."
+	@$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
+
 $(TARGET)$(EXESUFFIX): $(OBJS)
 	@echo "*** Linking it all together..."
 	@$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)