Moved *actual* files into source tree...

[virtualjaguar] / Makefile

diff --git a/Makefile b/Makefile
index 3a1a4dab305714a4c610a1e4d172635190a894e3..5df0a739f09078de765b2e2a2d622e1818a136f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ 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       \
@@ -71,6 +71,9 @@ OBJS = \
        obj/m68kopdm.o      \
        obj/m68kopnz.o      \
        obj/m68kdasm.o      \
+\
+       obj/gui.o           \
+\
        obj/blitter.o       \
        obj/cdrom.o         \
        obj/cdintf.o        \
@@ -81,7 +84,6 @@ OBJS = \
        obj/event.o         \
        obj/file.o          \
        obj/gpu.o           \
-       obj/gui.o           \
        obj/jagdasm.o       \
        obj/jaguar.o        \
        obj/jerry.o         \
@@ -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)