]> Shamusworld >> Repos - virtualjaguar/blobdiff - Makefile
Initial changeset to experimental branch
[virtualjaguar] / Makefile
index e1467c9da2cc6bb1485f591f28d552b95c8afe14..9b05b78616262802366eb955808816862fae0176 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 # by James L. Hammons
 #
-# This software is licensed under the GPL v2 or any later version. Set the
+# This software is licensed under the GPL v2 or any later version. See the
 # file GPL.TXT for details. ;-)
 #
 
@@ -36,7 +36,7 @@ else                                                                                  # *nix
 
 SYSTYPE    = __GCCUNIX__
 EXESUFFIX  =
-GLLIB      = -lGL
+GLLIB      = -lGL -lGLU
 ICON       =
 SDLLIBTYPE = --libs
 MSG        = generic Unix/Linux
@@ -50,14 +50,14 @@ TARGET     = vj
 
 # Note that we use optimization level 2 instead of 3--3 doesn't seem to gain much over 2
 CFLAGS   = -MMD -Wall -Wno-switch -O2 -D$(SYSTYPE) -ffast-math -fomit-frame-pointer `sdl-config --cflags`
-CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) \
+CPPFLAGS = -MMD -Wall -Wno-switch -Wno-non-virtual-dtor -O2 -D$(SYSTYPE) -Wno-trigraphs \
                -DHAVE_LIB_CDIO -ffast-math -fomit-frame-pointer `sdl-config --cflags` -g
 #              -fomit-frame-pointer `sdl-config --cflags` -g
 #              -fomit-frame-pointer `sdl-config --cflags` -DLOG_UNMAPPED_MEMORY_ACCESSES
 
 LDFLAGS =
 
-LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -lcdio
+LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB) -lcdio `pkg-config --libs QtGui QtOpenGL`
 # Comment out the above and uncomment below if you don't have libcdio.
 # Also, remove the "-DHAVE_LIB_CDIO" from CPPFLAGS above.
 #LIBS = -L/usr/local/lib -L/usr/lib `sdl-config $(SDLLIBTYPE)` -lstdc++ -lz $(GLLIB)
@@ -72,19 +72,12 @@ OBJS = \
        obj/m68kopnz.o      \
        obj/m68kdasm.o      \
 \
-       obj/button.o        \
-       obj/element.o       \
-       obj/filelist.o      \
-       obj/gui.o           \
-       obj/guimisc.o       \
-       obj/image.o         \
-       obj/listbox.o       \
-       obj/menu.o          \
-       obj/pushbutton.o    \
-       obj/slideswitch.o   \
-       obj/text.o          \
-       obj/textedit.o      \
-       obj/window.o        \
+       obj/app.o           \
+       obj/mainwin.o       \
+       obj/moc_mainwin.o   \
+       obj/glwidget.o      \
+       obj/moc_glwidget.o  \
+       obj/qrc_vj.o        \
 \
        obj/blitter.o       \
        obj/cdrom.o         \
@@ -112,6 +105,7 @@ OBJS = \
        obj/unzip.o         \
        obj/video.o         \
        obj/vj.o            \
+       obj/wavetable.o     \
        $(ICON)
 
 all: checkenv message obj $(TARGET)$(EXESUFFIX)
@@ -135,7 +129,7 @@ ifeq "" "$(shell which sdl-config)"
 else
        @echo -e "\033[01;37mOK\033[00m"
 endif
-# !!! NOTE !!! Need to put a check here for libcdio, GL, zlib
+# !!! NOTE !!! Need to put a check here for libcdio, GL, zlib, Qt
 
 message:
        @echo
@@ -143,6 +137,7 @@ message:
        @echo
 
 clean:
+       @echo
        @echo -en "\033[01;33m***\033[00;32m Cleaning out the garbage...\033[00m"
        @rm -rf obj
        @rm -f ./$(TARGET)$(EXESUFFIX)
@@ -159,6 +154,8 @@ $(ICON): res/$(TARGET).rc res/$(TARGET).ico
        @windres -i res/$(TARGET).rc -o $(ICON) --include-dir=./res
 endif
 
+# Main source compilation...
+
 obj/%.o: src/%.c
        @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
        @$(CC) $(CFLAGS) $(INCS) -c $< -o $@
@@ -167,61 +164,81 @@ obj/%.o: src/%.cpp
        @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
        @$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
 
-obj/%.o: src/gui/%.cpp
-       @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
-       @$(CC) $(CPPFLAGS) $(INCS) -c $< -o $@
-
+#$(TARGET)$(EXESUFFIX): $(OBJS)
 $(TARGET)$(EXESUFFIX): $(OBJS)
        @echo -e "\033[01;33m***\033[00;32m Linking it all together...\033[00m"
        @$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 #      strip --strip-all vj$(EXESUFFIX)
 #      upx -9 vj$(EXESUFFIX)
 
-# Pull in dependencies autogenerated by gcc's -MMD switch
-# The "-" in front is there just in case they haven't been created yet
+# Qt GUI stuff...
+
+src/gui/Makefile: src/gui/vj-gui.pro src/gui/vj-gui.qrc
+       @echo -e "\033[01;33m***\033[00;32m Creating Qt Makefile...\033[00m"
+       @qmake -o src/gui/Makefile src/gui/vj-gui.pro
+
+#obj/%.o: src/gui/%.cpp src/gui/Makefile
+#      @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+#      @make -C src/gui
+#OR:
+#      @cd src/gui && make
+
+#QT_SOURCES       = app.cpp \
+#              mainwin.cpp ../../obj/moc_mainwin.cpp \
+#              ../../obj/qrc_vj-gui.cpp
+#QT_OBJECTS       = ../../obj/app.o \
+#              ../../obj/mainwin.o \
+#              ../../obj/moc_mainwin.o \
+#              ../../obj/qrc_vj-gui.o
+QT_CFLAGS = `pkg-config --cflags QtGui`
+# !!! THESE DEFINES ARE PLATFORM DEPENDENT !!!
+#QT_DEFINES = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+QT_DEFINES = -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+#QT_INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I./src/gui -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I./obj
+QT_INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I./src -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtOpenGL -I/usr/include/qt4 -I/usr/X11R6/include -I./obj
+QT_CXXFLAGS = -pipe -O2 -march=pentium-m -pipe -D_REENTRANT -Wall -W $(QT_DEFINES) -D$(SYSTYPE)
+
+obj/moc_%.cpp: src/gui/%.h
+       @echo -e "\033[01;33m***\033[00;32m Creating $@...\033[00m"
+       @/usr/bin/moc $(QT_DEFINES) $(QT_INCPATH) $< -o $@
+
+obj/moc_%.o: obj/moc_%.cpp
+       @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+       @$(CC) -c $(QT_CXXFLAGS) $(QT_INCPATH) -o $@ $<
 
--include obj/*.d
+obj/qrc_vj.cpp: src/gui/vj.qrc src/gui/res/vj.xpm
+       @echo -e "\033[01;33m***\033[00;32m Creating qrc_vj.cpp...\033[00m"
+       @/usr/bin/rcc -name vj src/gui/vj.qrc -o obj/qrc_vj.cpp
+
+obj/qrc_%.o: obj/qrc_%.cpp
+       @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+       @$(CC) -c $(QT_CXXFLAGS) $(QT_INCPATH) -o $@ $<
+
+obj/%.o: src/gui/%.cpp src/gui/%.h
+       @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+       @$(CC) -c $(QT_CXXFLAGS) $(QT_INCPATH) -o $@ $<
 
 #
 # Musashi specific stuffola
 #
 
-#obj/m68k%.o: obj/m68k%.c obj/m68kops.h
-#      $(CC) $(CFLAGS) -Iobj -c src/m68k%.c -o obj/m68k%.o
-
-#obj/m68k%.o: obj/m68k%.c obj/m68kmake$(EXESUFFIX)
-#      $(CC) $(CFLAGS) -Iobj -c src/m68k%.c -o obj/m68k%.o
+obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c
+       @echo -e "\033[01;33m***\033[00;32m Preparing to make the Musashi core...\033[00m"
+       @$(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX)
 
-#see if you can collapse all this crap into one or two lines...
-#NOTE: The above doesn't work for some reason...
+obj/m68kops.h obj/m68kops.c obj/m68kopac.c obj/m68kopdm.c obj/m68kopnz.c: obj/m68kmake$(EXESUFFIX)
+       @echo -e "\033[01;33m***\033[00;32m Creating m68kops.h...\033[00m"
+       @obj/m68kmake obj src/m68k_in.c
 
 obj/m68kcpu.o: obj/m68kops.h src/m68k.h src/m68kconf.h
        @echo -e "\033[01;33m***\033[00;32m Compiling m68kcpu.c...\033[00m"
        @$(CC) $(CFLAGS) -Iobj -c src/m68kcpu.c -o obj/m68kcpu.o
 
-obj/m68kops.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kops.c src/m68k.h src/m68kconf.h
-       @echo -e "\033[01;33m***\033[00;32m Compiling m68kops.c...\033[00m"
-       @$(CC) $(CFLAGS) -Isrc -c obj/m68kops.c -o obj/m68kops.o
-
-obj/m68kopac.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopac.c src/m68k.h src/m68kconf.h
-       @echo -e "\033[01;33m***\033[00;32m Compiling m68kopac.c...\033[00m"
-       @$(CC) $(CFLAGS) -Isrc -c obj/m68kopac.c -o obj/m68kopac.o
-
-obj/m68kopdm.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopdm.c src/m68k.h src/m68kconf.h
-       @echo -e "\033[01;33m***\033[00;32m Compiling m68kopdm.c...\033[00m"
-       @$(CC) $(CFLAGS) -Isrc -c obj/m68kopdm.c -o obj/m68kopdm.o
-
-obj/m68kopnz.o: obj/m68kmake$(EXESUFFIX) obj/m68kops.h obj/m68kopnz.c src/m68k.h src/m68kconf.h
-       @echo -e "\033[01;33m***\033[00;32m Compiling m68kopnz.c...\033[00m"
-       @$(CC) $(CFLAGS) -Isrc -c obj/m68kopnz.c -o obj/m68kopnz.o
-
-obj/m68kdasm.o: src/m68kdasm.c src/m68k.h src/m68kconf.h
-       @echo -e "\033[01;33m***\033[00;32m Compiling m68kdasm.c...\033[00m"
-       @$(CC) $(CFLAGS) -Isrc -c src/m68kdasm.c -o obj/m68kdasm.o
+obj/m68kop%.o: obj/m68kop%.c
+       @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
+       @$(CC) $(CFLAGS) -Isrc -c $< -o $@
 
-obj/m68kops.h: obj/m68kmake$(EXESUFFIX)
-       @obj/m68kmake obj src/m68k_in.c
+# Pull in dependencies autogenerated by gcc's -MMD switch
+# The "-" in front is there just in case they haven't been created yet
 
-obj/m68kmake$(EXESUFFIX): src/m68kmake.c src/m68k_in.c
-       @echo -e "\033[01;33m***\033[00;32m Preparing to make the Musashi core...\033[00m"
-       @$(CC) $(WARNINGS) src/m68kmake.c -o obj/m68kmake$(EXESUFFIX)
+-include obj/*.d