Fixed colors in tom.cpp.

[virtualjaguar] / Makefile

diff --git a/Makefile b/Makefile
index c4a771f55745b5be862cd2ea79f7919118f24d24..c191bf480cdfa01ba3dc98ae025c1fd4e30bb00d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ endif
 
 CC         = gcc
 LD         = gcc
-TARGET     = vj
+TARGET     = virtualjaguar
 
 # 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`
@@ -72,20 +72,20 @@ 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      \
-       obj/moc_glwidget.o  \
-       obj/qrc_vj.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          \
+       obj/moc_glwidget.o      \
+       obj/qrc_virtualjaguar.o \
 \
        obj/blitter.o       \
        obj/cdrom.o         \
@@ -96,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        \
@@ -112,7 +113,7 @@ OBJS = \
        obj/tom.o           \
        obj/unzip.o         \
        obj/video.o         \
-       obj/vj.o            \
+       obj/virtualjaguar.o \
        obj/wavetable.o     \
        $(ICON)
 
@@ -204,7 +205,7 @@ QT_CFLAGS = -MMD `pkg-config --cflags QtGui`
 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 = -MMD -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) -g
 
 obj/moc_%.cpp: src/gui/%.h
        @echo -e "\033[01;33m***\033[00;32m Creating $@...\033[00m"
@@ -214,9 +215,9 @@ 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 res/vj.xpm
+obj/qrc_virtualjaguar.cpp: src/gui/virtualjaguar.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
+       @/usr/bin/rcc -name virtualjaguar src/gui/virtualjaguar.qrc -o obj/qrc_virtualjaguar.cpp
 
 obj/qrc_%.o: obj/qrc_%.cpp
        @echo -e "\033[01;33m***\033[00;32m Compiling $<...\033[00m"