[VM][Qt] Fix definition of screen aspects.

diff --git a/source/build-cmake/cmake/config_commonsource.cmake b/source/build-cmake/cmake/config_commonsource.cmake
index 1d79ea4..f8868cf 100644 (file)
--- a/source/build-cmake/cmake/config_commonsource.cmake
+++ b/source/build-cmake/cmake/config_commonsource.cmake
@@ -4,7 +4,6 @@
 # this part was written only me.
 
 include(CheckFunctionExists)
-
 # Use cmake if enabled.
 SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
 SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
@@ -17,13 +16,12 @@ add_definitions(-DUSE_QT)
 
 # Build Flags
 
-
-find_package(Gettext)
-include_directories(${GETTEXT_INCLUDE_PATH})
-include(compile_gettext_catalogue)
-if(GETTEXT_FOUND)
-   add_definitions(-DUSE_GETTEXT)
-endif()
+#find_package(Gettext)
+#include_directories(${GETTEXT_INCLUDE_PATH})
+#include(compile_gettext_catalogue)
+#if(GETTEXT_FOUND)
+#   add_definitions(-DUSE_GETTEXT)
+#endif()
 
 
 find_package(Freetype)

diff --git a/source/src/emu.h b/source/src/emu.h
index a3dfcaf..218129d 100644 (file)
--- a/source/src/emu.h
+++ b/source/src/emu.h
@@ -108,6 +108,12 @@
 #ifndef SCREEN_HEIGHT_ASPECT
 #define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
 #endif
+#ifndef WINDOW_WIDTH_ASPECT
+#define WINDOW_WIDTH_ASPECT SCREEN_WIDTH
+#endif
+#ifndef WINDOW_HEIGHT_ASPECT
+#define WINDOW_HEIGHT_ASPECT SCREEN_HEIGHT
+#endif
 #ifndef WINDOW_WIDTH
 #define WINDOW_WIDTH SCREEN_WIDTH_ASPECT
 #endif

diff --git a/source/src/qt/common/qt_main.cpp b/source/src/qt/common/qt_main.cpp
index 02c0c87..f336fd7 100644 (file)
--- a/source/src/qt/common/qt_main.cpp
+++ b/source/src/qt/common/qt_main.cpp
@@ -838,11 +838,11 @@ int main(int argc, char *argv[])
        sRssDir = RSSDIR;
 #endif
    
-       setlocale(LC_ALL, "");
-       bindtextdomain("messages", sRssDir.c_str());
-       textdomain("messages");
-       AGAR_DebugLog(AGAR_LOG_DEBUG, "I18N via gettext initialized."); // Will move to Qt;
-       AGAR_DebugLog(AGAR_LOG_DEBUG, "I18N resource dir: %s", sRssDir.c_str());
+       //setlocale(LC_ALL, "");
+       //bindtextdomain("messages", sRssDir.c_str());
+       //textdomain("messages");
+       //AGAR_DebugLog(AGAR_LOG_DEBUG, "I18N via gettext initialized."); // Will move to Qt;
+       //AGAR_DebugLog(AGAR_LOG_DEBUG, "I18N resource dir: %s", sRssDir.c_str());
 
        //SDL_Init(SDL_INIT_EVERYTHING | SDL_INIT_TIMER);
 

diff --git a/source/src/vm/gamegear/gamegear.h b/source/src/vm/gamegear/gamegear.h
index 46ba013..910661e 100644 (file)
--- a/source/src/vm/gamegear/gamegear.h
+++ b/source/src/vm/gamegear/gamegear.h
@@ -22,6 +22,11 @@
 #define TMS9918A_VRAM_SIZE             0x4000
 #define TMS9918A_LIMIT_SPRITES
 #define MAX_DRIVE                              1
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT SCREEN_WIDTH
+#define WINDOW_HEIGHT_ASPECT SCREEN_HEIGHT 
+
 
 // device informations for win32
 #define USE_CART1

diff --git a/source/src/vm/gamegear/mastersystem.h b/source/src/vm/gamegear/mastersystem.h
index 21c359c..f2ade6c 100644 (file)
--- a/source/src/vm/gamegear/mastersystem.h
+++ b/source/src/vm/gamegear/mastersystem.h
@@ -22,6 +22,10 @@
 #define TMS9918A_VRAM_SIZE             0x4000
 #define TMS9918A_LIMIT_SPRITES
 ///#define MAX_DRIVE                   1
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT SCREEN_WIDTH
+#define WINDOW_HEIGHT_ASPECT SCREEN_HEIGHT 
 
 // device informations for win32
 #define USE_CART1

diff --git a/source/src/vm/msx/msx.h b/source/src/vm/msx/msx.h
index 9a99542..f074beb 100644 (file)
--- a/source/src/vm/msx/msx.h
+++ b/source/src/vm/msx/msx.h
@@ -50,6 +50,11 @@
 // for Flappy Limited '85
 #define YM2203_PORT_MODE       0x80
 
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT SCREEN_WIDTH
+#define WINDOW_HEIGHT_ASPECT SCREEN_HEIGHT 
+
 // device informations for win32
 #define USE_CART1
 #define USE_CART2

diff --git a/source/src/vm/mz2500/mz2500.h b/source/src/vm/mz2500/mz2500.h
index ed30eb0..328b316 100644 (file)
--- a/source/src/vm/mz2500/mz2500.h
+++ b/source/src/vm/mz2500/mz2500.h
@@ -24,6 +24,10 @@
 #define HAS_MB8876
 #define HAS_RP5C15
 #define DATAREC_SOUND
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT 640 
+#define WINDOW_HEIGHT_ASPECT 480
 
 // memory wait
 #define Z80_MEMORY_WAIT

diff --git a/source/src/vm/mz2500/mz80b.h b/source/src/vm/mz2500/mz80b.h
index 89fd78d..9ccad42 100644 (file)
--- a/source/src/vm/mz2500/mz80b.h
+++ b/source/src/vm/mz2500/mz80b.h
@@ -42,6 +42,11 @@
 #define I8259_MAX_CHIPS                1
 #endif
 
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT 640 
+#define WINDOW_HEIGHT_ASPECT 480
+
 // memory wait
 #define Z80_MEMORY_WAIT
 #define Z80_IO_WAIT

diff --git a/source/src/vm/mz700/mz700.h b/source/src/vm/mz700/mz700.h
index 93776ee..88edcac 100644 (file)
--- a/source/src/vm/mz700/mz700.h
+++ b/source/src/vm/mz700/mz700.h
@@ -45,6 +45,10 @@
 #define MAX_DRIVE              4
 #define HAS_MB8876
 #endif
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT 640 
+#define WINDOW_HEIGHT_ASPECT 480
 
 // device informations for win32
 #if defined(_MZ700)

diff --git a/source/src/vm/mz80k/mz80k.h b/source/src/vm/mz80k/mz80k.h
index de636db..dc4f23a 100644 (file)
--- a/source/src/vm/mz80k/mz80k.h
+++ b/source/src/vm/mz80k/mz80k.h
@@ -41,6 +41,11 @@
 #define MAX_DRIVE              4
 #endif
 
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT 640 
+#define WINDOW_HEIGHT_ASPECT 480
+
 // device informations for win32
 #define USE_TAPE
 #define USE_TAPE_PTR

diff --git a/source/src/vm/pc6001/pc6001.h b/source/src/vm/pc6001/pc6001.h
index 91c86ee..1e6cd76 100644 (file)
--- a/source/src/vm/pc6001/pc6001.h
+++ b/source/src/vm/pc6001/pc6001.h
@@ -55,6 +55,11 @@
 #define SCREEN_HEIGHT          400
 #define CPU_CLOCKS             3580000
 #endif
+// 4:3
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT 640 
+#define WINDOW_HEIGHT_ASPECT 480
 
 // device informations for virtual machine
 #define FRAMES_PER_SEC         60

diff --git a/source/src/vm/pc8801/pc8801.h b/source/src/vm/pc8801/pc8801.h
index 3dfc30e..f7c8992 100644 (file)
--- a/source/src/vm/pc8801/pc8801.h
+++ b/source/src/vm/pc8801/pc8801.h
@@ -59,8 +59,10 @@
 #define SUPPORT_VARIABLE_TIMING
 
 // 4:3
-#define SCREEN_WIDTH_ASPECT 400 
-#define SCREEN_HEIGHT_ASPECT 300
+#define SCREEN_WIDTH_ASPECT 640 
+#define SCREEN_HEIGHT_ASPECT 400
+#define WINDOW_WIDTH_ASPECT 640 
+#define WINDOW_HEIGHT_ASPECT 480
 // device informations for win32
 // device informations for win32
 #if defined(_PC8001SR)

diff --git a/source/src/vm/pc9801/pc9801.h b/source/src/vm/pc9801/pc9801.h
index 7946b62..12f826a 100644 (file)
--- a/source/src/vm/pc9801/pc9801.h
+++ b/source/src/vm/pc9801/pc9801.h
@@ -34,8 +34,10 @@
 #endif
 
 // 4:3
-#define SCREEN_WIDTH_ASPECT 400 
-#define SCREEN_HEIGHT_ASPECT 300
+#define SCREEN_WIDTH_ASPECT 640 
+#define SCREEN_HEIGHT_ASPECT 400
+#define WINDOW_WIDTH_ASPECT 640 
+#define WINDOW_HEIGHT_ASPECT 480
 
 #if defined(_PC9801) || defined(_PC9801E)
 #define SUPPORT_CMT_IF

diff --git a/source/src/vm/tk80bs/tk80bs.h b/source/src/vm/tk80bs/tk80bs.h
index 76a42ea..491c373 100644 (file)
--- a/source/src/vm/tk80bs/tk80bs.h
+++ b/source/src/vm/tk80bs/tk80bs.h
@@ -25,6 +25,10 @@
 #define MEMORY_ADDR_MAX                0x10000
 #define MEMORY_BANK_SIZE       0x200
 #define IO_ADDR_MAX            0x10000
+#define SCREEN_WIDTH_ASPECT SCREEN_WIDTH 
+#define SCREEN_HEIGHT_ASPECT SCREEN_HEIGHT
+#define WINDOW_WIDTH_ASPECT 256
+#define WINDOW_HEIGHT_ASPECT 192 
 
 // device informations for win32
 #define USE_BOOT_MODE          2

diff --git a/source/src/vm/x1/x1.h b/source/src/vm/x1/x1.h
index 2a34a21..e35b593 100644 (file)
--- a/source/src/vm/x1/x1.h
+++ b/source/src/vm/x1/x1.h
@@ -79,8 +79,11 @@
 #endif
 
 // 4:3
-#define SCREEN_WIDTH_ASPECT 400 
-#define SCREEN_HEIGHT_ASPECT 300
+#define SCREEN_WIDTH_ASPECT 640 
+#define SCREEN_HEIGHT_ASPECT 400
+#define WINDOW_WIDTH_ASPECT 640 
+#define WINDOW_HEIGHT_ASPECT 480
+
 // device informations for win32
 #define USE_SPECIAL_RESET
 #ifdef _X1TURBO_FEATURE