Added missing images, added some fixes to ZIP file support

[virtualjaguar] / Makefile

diff --git a/Makefile b/Makefile
index 9b05b78616262802366eb955808816862fae0176..31d3d9d8cca45517a27d24737461e8e9869ce0f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,15 @@ OBJS = \
        obj/m68kopnz.o      \
        obj/m68kdasm.o      \
 \
+       obj/about.o         \
        obj/app.o           \
+       obj/configwin.o     \
+       obj/filepicker.o    \
+       obj/moc_filepicker.o \
+       obj/filelistmodel.o \
+       obj/filethread.o    \
+       obj/imagedelegate.o \
+       obj/moc_filethread.o \
        obj/mainwin.o       \
        obj/moc_mainwin.o   \
        obj/glwidget.o      \
@@ -88,6 +96,7 @@ OBJS = \
        obj/eeprom.o        \
        obj/event.o         \
        obj/file.o          \
+       obj/filedb.o        \
        obj/gpu.o           \
        obj/jagdasm.o       \
        obj/jaguar.o        \
@@ -190,13 +199,13 @@ src/gui/Makefile: src/gui/vj-gui.pro src/gui/vj-gui.qrc
 #              ../../obj/mainwin.o \
 #              ../../obj/moc_mainwin.o \
 #              ../../obj/qrc_vj-gui.o
-QT_CFLAGS = `pkg-config --cflags QtGui`
+QT_CFLAGS = -MMD `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)
+QT_CXXFLAGS = -MMD -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"
@@ -206,7 +215,7 @@ obj/moc_%.o: obj/moc_%.cpp
        @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"
        @$(CC) -c $(QT_CXXFLAGS) $(QT_INCPATH) -o $@ $<
 
-obj/qrc_vj.cpp: src/gui/vj.qrc src/gui/res/vj.xpm
+obj/qrc_vj.cpp: src/gui/vj.qrc 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