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 \
obj/tom.o \
obj/unzip.o \
obj/video.o \
- obj/vj.o \
+ obj/virtualjaguar.o \
obj/wavetable.o \
$(ICON)
@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"
}
}
- 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!
SOURCES += filethread.cpp
SOURCES += configwin.cpp
-RESOURCES += vj.qrc
+RESOURCES += virtualjaguar.qrc
OBJECTS_DIR = ../../obj
MOC_DIR = ../../obj
return vector;
}
-#define USE_NEW_MMU
+//#define USE_NEW_MMU
unsigned int m68k_read_memory_8(unsigned int address)
{
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
if (!strcmp(argv[i], "-joyport"))
{
vjs.joyport = atoi(argv[++i]) + 1;
+
if (vjs.joyport > 3)
vjs.joyport = 3;
}
if (!strcmp(argv[i], "-frameskip"))
{
nFrameskip = atoi(argv[++i]) + 1;
+
if (nFrameskip > 10)
nFrameskip = 10;
}