Various renaming to accomodate change from vj to virtualjaguar.

diff --git a/Makefile b/Makefile
index eaa5953d11f28e5442a09e76263be517ad028675..87489b9fc7a6fd979ed1960d331984d66c40f3b3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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         \
@@ -113,7 +113,7 @@ OBJS = \
        obj/tom.o           \
        obj/unzip.o         \
        obj/video.o         \
-       obj/vj.o            \
+       obj/virtualjaguar.o \
        obj/wavetable.o     \
        $(ICON)
 
@@ -215,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"

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index 264a79a6f54050ec5e0b238ce5deab0df74a5f22..e878edfc9c206836db892fc13cb7cf572038f230 100644 (file)
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -32,12 +32,12 @@ int main(int argc, char * argv[])
                }
        }
 
-       Q_INIT_RESOURCE(vj);    // This must the same name as the exe filename
+       Q_INIT_RESOURCE(virtualjaguar); // This must the same name as the exe filename
 //or is it the .qrc filename???
        // This is so we can pass this stuff using signal/slot mechanism...
 //ick  int id = qRegisterMetaType<uint32>();
 
-       LogInit("vj.log");                                                      // Init logfile
+       LogInit("virtualjaguar.log");                           // Init logfile
        App app(argc, argv);                                            // Declare an instance of the application
 
        int retVal = app.exec();                                        // And run it!

diff --git a/src/gui/vj.pro b/src/gui/virtualjaguar.pro
similarity index 94%
rename from src/gui/vj.pro
rename to src/gui/virtualjaguar.pro
index 5f1551faed03a91af8aef6b25f9ce6e8a575ec4b..ece4f812badfe21e1c1256f77e317c1aad8932a7 100644 (file)
--- a/src/gui/vj.pro
+++ b/src/gui/virtualjaguar.pro
@@ -22,7 +22,7 @@ SOURCES += filepicker.cpp
 SOURCES += filethread.cpp
 SOURCES += configwin.cpp
 
-RESOURCES += vj.qrc
+RESOURCES += virtualjaguar.qrc
 
 OBJECTS_DIR = ../../obj
 MOC_DIR = ../../obj

diff --git a/src/gui/vj.qrc b/src/gui/virtualjaguar.qrc
similarity index 100%
rename from src/gui/vj.qrc
rename to src/gui/virtualjaguar.qrc

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index e75ac0ad32aaf0ff02685b8561fad963d6a82fca..cc1a5acb9f95d08a41253ef0ffe244bab9bcaff5 100644 (file)
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -791,7 +791,7 @@ int irq_ack_handler(int level)
        return vector;
 }
 
-#define USE_NEW_MMU
+//#define USE_NEW_MMU
 
 unsigned int m68k_read_memory_8(unsigned int address)
 {
@@ -1051,8 +1051,8 @@ if (address == 0xF02110)
                WriteLog("\tA0=%08X, A1=%08X, D0=%08X, D1=%08X\n",
                        m68k_get_reg(NULL, M68K_REG_A0), m68k_get_reg(NULL, M68K_REG_A1),
                        m68k_get_reg(NULL, M68K_REG_D0), m68k_get_reg(NULL, M68K_REG_D1));
-       }
 #endif
+       }
 #else
        MMUWrite16(address, value, M68K);
 #endif

diff --git a/src/vj.cpp b/src/virtualjaguar.cpp
similarity index 99%
rename from src/vj.cpp
rename to src/virtualjaguar.cpp
index 0619b0523d070f2de61b07053a0ca800aaffa9cf..e29f65b3a47200aa58c7c231818d7483df06761c 100644 (file)
--- a/src/vj.cpp
+++ b/src/virtualjaguar.cpp
@@ -75,6 +75,7 @@ int main_old(int argc, char * argv[])
                if (!strcmp(argv[i], "-joyport"))
                {
                        vjs.joyport = atoi(argv[++i]) + 1;
+
                        if (vjs.joyport > 3)
                                vjs.joyport = 3;
                }
@@ -82,6 +83,7 @@ int main_old(int argc, char * argv[])
                if (!strcmp(argv[i], "-frameskip"))
                {
                        nFrameskip = atoi(argv[++i]) + 1;
+
                        if (nFrameskip > 10)
                                nFrameskip = 10;
                }