OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revisioncf5d44dca0c28b73632775bcea737cec5bdd9267 (tree)
Zeit2017-03-15 02:26:07
AutorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[Build][CMAKE][MSX] Working with MSX1/2.

Ändern Zusammenfassung

Diff

--- /dev/null
+++ b/source/build-cmake/cmake/config_msx.cmake
@@ -0,0 +1,118 @@
1+# Build Common Sourcecode Project, Qt.
2+# (C) 2014 K.Ohta <whatisthis.sowhat@gmail.com>
3+# This is part of , but license is apache 2.2,
4+# this part was written only me.
5+
6+message("")
7+message("** Start of configure CommonSourceProject,MSX Series Qt **")
8+message("")
9+
10+set(VMFILES_BASE
11+ z80.cpp
12+ i8255.cpp
13+ prnfile.cpp
14+ datarec.cpp
15+ event.cpp
16+ io.cpp
17+ memory.cpp
18+)
19+
20+set(VMFILES_LIB
21+ ym2413.cpp
22+ ay_3_891x.cpp
23+ pcm1bit.cpp
24+ not.cpp
25+)
26+
27+#set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
28+
29+set(BUILD_SHARED_LIBS OFF)
30+set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
31+set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
32+
33+include(detect_target_cpu)
34+#include(windows-mingw-cross)
35+# set entry
36+set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.")
37+
38+add_definitions(-D_CONFIGURE_WITH_CMAKE)
39+
40+set(VMFILES_MSX2 ${VMFILES_BASE}
41+ rp5c01.cpp
42+ v99x8.cpp
43+ disk.cpp
44+)
45+
46+set(VMFILES_MSX1 ${VMFILES_BASE}
47+ tms9918a.cpp
48+ disk.cpp
49+)
50+
51+set(VMFILES_PX7 ${VMFILES_BASE}
52+ tms9918a.cpp
53+ ld700.cpp
54+)
55+
56+set(VMFILES_HX20 ${VMFILES_BASE}
57+ tms9918a.cpp
58+ disk.cpp
59+)
60+
61+set(VMFILES_FSA1 ${VMFILES_BASE}
62+ rp5c01.cpp
63+ v99x8.cpp
64+ disk.cpp
65+)
66+
67+set(VMFILES_HBF1XDJ ${VMFILES_BASE}
68+ rp5c01.cpp
69+ v99x8.cpp
70+ disk.cpp
71+)
72+
73+set(VMFILES_MSX2PLUS ${VMFILES_BASE}
74+ rp5c01.cpp
75+ v99x8.cpp
76+ disk.cpp
77+)
78+
79+if(BUILD_PX7)
80+ set(VMFILES ${VMFILES_PX7})
81+ add_definitions(-D_PX7)
82+ set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/px7.qrc)
83+elseif(BUILD_MSX2)
84+ set(VMFILES ${VMFILES_MSX2})
85+ add_definitions(-D_MSX2)
86+ set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/msx2.qrc)
87+elseif(BUILD_MSX2PLUS)
88+ set(VMFILES ${VMFILES_MSX2PLUS})
89+ add_definitions(-D_MSX2P)
90+ set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/msx2plus.qrc)
91+elseif(BUILD_HX20)
92+ set(VMFILES ${VMFILES_HX20})
93+ add_definitions(-D_HX20)
94+ set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/hx20.qrc)
95+elseif(BUILD_FSA1)
96+ set(VMFILES ${VMFILES_FSA1})
97+ add_definitions(-D_FSA1)
98+ set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fsa1.qrc)
99+elseif(BUILD_HBF1XDJ)
100+ set(VMFILES ${VMFILES_HBF1XDJ})
101+ add_definitions(-D_HBF1XDJ)
102+ set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/hbf1xdj.qrc)
103+else()
104+ set(VMFILES ${VMFILES_MSX1})
105+ add_definitions(-D_MSX1)
106+ set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/msx1.qrc)
107+endif()
108+
109+if(USE_CMT_SOUND)
110+ set(VMFILES_MSX ${VMFILES_BASE})
111+endif()
112+
113+include(config_commonsource)
114+
115+
116+
117+
118+
--- /dev/null
+++ b/source/build-cmake/fsa1/CMakeLists.txt
@@ -0,0 +1,34 @@
1+# Build Common Sourcecode Project, Qt.
2+# (C) 2014 K.Ohta <whatisthis.sowhat@gmail.com>
3+# This is part of XM7/SDL, but license is apache 2.2,
4+# this part was written only me.
5+
6+cmake_minimum_required (VERSION 2.8)
7+cmake_policy(SET CMP0011 NEW)
8+
9+message("")
10+message("** Start of configure CommonSourceProject,MSX2, Qt **")
11+message("")
12+
13+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
14+
15+project (emufsa1)
16+set(EXEC_TARGET emufsa1)
17+set(VM_NAME msx)
18+set(USE_FMGEN ON)
19+set(WITH_JOYSTICK ON)
20+set(WITH_MOUSE ON)
21+
22+set(BUILD_PX7 OFF CACHE BOOL "Build for Pioneer PX7")
23+set(BUILD_MSX1 OFF CACHE BOOL "Build for MSX1")
24+set(BUILD_MSX2 OFF CACHE BOOL "Build for MSX2")
25+set(BUILD_MSX2PLUS OFF CACHE BOOL "Build for MSX2+")
26+set(BUILD_HX20 OFF CACHE BOOL "Build for Toshiba HX-20")
27+set(BUILD_FSA1 ON CACHE BOOL "Build for Panasonic FS-A1")
28+set(BUILD_HBF1XDJ OFF CACHE BOOL "Build for Sony HB-F1XDJ")
29+
30+set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
31+set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
32+set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
33+
34+include(config_msx)
--- /dev/null
+++ b/source/build-cmake/hbf1xdj/CMakeLists.txt
@@ -0,0 +1,34 @@
1+# Build Common Sourcecode Project, Qt.
2+# (C) 2014 K.Ohta <whatisthis.sowhat@gmail.com>
3+# This is part of XM7/SDL, but license is apache 2.2,
4+# this part was written only me.
5+
6+cmake_minimum_required (VERSION 2.8)
7+cmake_policy(SET CMP0011 NEW)
8+
9+message("")
10+message("** Start of configure CommonSourceProject,MSX2, Qt **")
11+message("")
12+
13+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
14+
15+project (emuhbf1xdj)
16+set(EXEC_TARGET emuhbf1xdj)
17+set(VM_NAME msx)
18+set(USE_FMGEN ON)
19+set(WITH_JOYSTICK ON)
20+set(WITH_MOUSE ON)
21+
22+set(BUILD_PX7 OFF CACHE BOOL "Build for Pioneer PX7")
23+set(BUILD_MSX1 OFF CACHE BOOL "Build for MSX1")
24+set(BUILD_MSX2 OFF CACHE BOOL "Build for MSX2")
25+set(BUILD_MSX2PLUS OFF CACHE BOOL "Build for MSX2+")
26+set(BUILD_HX20 OFF CACHE BOOL "Build for Toshiba HX-20")
27+set(BUILD_FSA1 OFF CACHE BOOL "Build for Panasonic FS-A1")
28+set(BUILD_HBF1XDJ ON CACHE BOOL "Build for Sony HB-F1XDJ")
29+
30+set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
31+set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
32+set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
33+
34+include(config_msx)
--- /dev/null
+++ b/source/build-cmake/hx20/CMakeLists.txt
@@ -0,0 +1,34 @@
1+# Build Common Sourcecode Project, Qt.
2+# (C) 2014 K.Ohta <whatisthis.sowhat@gmail.com>
3+# This is part of XM7/SDL, but license is apache 2.2,
4+# this part was written only me.
5+
6+cmake_minimum_required (VERSION 2.8)
7+cmake_policy(SET CMP0011 NEW)
8+
9+message("")
10+message("** Start of configure CommonSourceProject,MSX2, Qt **")
11+message("")
12+
13+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
14+
15+project (emumsx2plus)
16+set(EXEC_TARGET emumsx2plus)
17+set(VM_NAME msx)
18+set(USE_FMGEN ON)
19+set(WITH_JOYSTICK ON)
20+set(WITH_MOUSE ON)
21+
22+set(BUILD_PX7 OFF CACHE BOOL "Build for Pioneer PX7")
23+set(BUILD_MSX1 OFF CACHE BOOL "Build for MSX1")
24+set(BUILD_MSX2 OFF CACHE BOOL "Build for MSX2")
25+set(BUILD_MSX2PLUS OFF CACHE BOOL "Build for MSX2+")
26+set(BUILD_HX20 ON CACHE BOOL "Build for Toshiba HX-20")
27+set(BUILD_FSA1 OFF CACHE BOOL "Build for Panasonic FS-A1")
28+set(BUILD_HBF1XDJ OFF CACHE BOOL "Build for Sony HB-F1XDJ")
29+
30+set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
31+set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
32+set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
33+
34+include(config_msx)
--- a/source/build-cmake/msx1/CMakeLists.txt
+++ b/source/build-cmake/msx1/CMakeLists.txt
@@ -19,66 +19,16 @@ set(USE_FMGEN ON)
1919 set(WITH_JOYSTICK ON)
2020 set(WITH_MOUSE ON)
2121
22-set(VMFILES_BASE
23- z80.cpp
24- tms9918a.cpp
25- i8255.cpp
26- ym2203.cpp
27-
28- #
29- datarec.cpp
30- event.cpp
31- io.cpp
32- memory.cpp
33-)
34-
35-set(VMFILES_LIB
36- pcm1bit.cpp
37- not.cpp
38-)
3922 set(BUILD_PX7 OFF CACHE BOOL "Build for Pioneer PX7")
4023 set(BUILD_MSX1 ON CACHE BOOL "Build for MSX1")
4124 set(BUILD_MSX2 OFF CACHE BOOL "Build for MSX2")
25+set(BUILD_MSX2PLUS OFF CACHE BOOL "Build for MSX2+")
26+set(BUILD_HX20 OFF CACHE BOOL "Build for Toshiba HX-20")
27+set(BUILD_FSA1 OFF CACHE BOOL "Build for Panasonic FS-A1")
28+set(BUILD_HBF1XDJ OFF CACHE BOOL "Build for Sony HB-F1XDJ")
29+
4230 set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
4331 set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
4432 set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
4533
46-set(VMFILES_MSX2 ${VMFILES_BASE}
47- rp5c01.cpp
48- v99x8.cpp
49- disk.cpp
50-)
51-
52-set(VMFILES_MSX1 ${VMFILES_BASE}
53- tms9918a.cpp
54- disk.cpp
55-)
56-
57-set(VMFILES_PX7 ${VMFILES_BASE}
58- tms9918a.cpp
59- ld700.cpp
60-)
61-
62-if(USE_CMT_SOUND)
63- set(VMFILES_MSX ${VMFILES_BASE})
64-endif()
65-
66-include(detect_target_cpu)
67-# set entry
68-set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.")
69-
70-if(BUILD_PX7)
71- set(VMFILES ${VMFILES_PX7})
72- add_definitions(-D_PX7)
73- set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/px7.qrc)
74-elseif(BUILD_MSX2)
75- set(VMFILES ${VMFILES_MSX2})
76- add_definitions(-D_MSX2)
77- set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/msx2.qrc)
78-else()
79- set(VMFILES ${VMFILES_MSX1})
80- add_definitions(-D_MSX1)
81- set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/msx1.qrc)
82-endif()
83-
84-include(config_commonsource)
34+include(config_msx)
--- a/source/build-cmake/msx2/CMakeLists.txt
+++ b/source/build-cmake/msx2/CMakeLists.txt
@@ -19,65 +19,16 @@ set(USE_FMGEN ON)
1919 set(WITH_JOYSTICK ON)
2020 set(WITH_MOUSE ON)
2121
22-set(VMFILES_BASE
23- z80.cpp
24- tms9918a.cpp
25- i8255.cpp
26-
27- ym2203.cpp
28- datarec.cpp
29- event.cpp
30- io.cpp
31- memory.cpp
32-)
33-set(VMFILES_LIB
34- pcm1bit.cpp
35- not.cpp
36-)
37-
3822 set(BUILD_PX7 OFF CACHE BOOL "Build for Pioneer PX7")
3923 set(BUILD_MSX1 OFF CACHE BOOL "Build for MSX1")
4024 set(BUILD_MSX2 ON CACHE BOOL "Build for MSX2")
25+set(BUILD_MSX2PLUS OFF CACHE BOOL "Build for MSX2+")
26+set(BUILD_HX20 OFF CACHE BOOL "Build for Toshiba HX-20")
27+set(BUILD_FSA1 OFF CACHE BOOL "Build for Panasonic FS-A1")
28+set(BUILD_HBF1XDJ OFF CACHE BOOL "Build for Sony HB-F1XDJ")
29+
4130 set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
4231 set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
4332 set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
4433
45-set(VMFILES_MSX2 ${VMFILES_BASE}
46- rp5c01.cpp
47- v99x8.cpp
48- disk.cpp
49-)
50-
51-set(VMFILES_MSX1 ${VMFILES_BASE}
52- tms9918a.cpp
53- disk.cpp
54-)
55-
56-set(VMFILES_PX7 ${VMFILES_BASE}
57- tms9918a.cpp
58- ld700.cpp
59-)
60-
61-if(USE_CMT_SOUND)
62- set(VMFILES_MSX ${VMFILES_BASE})
63-endif()
64-
65-include(detect_target_cpu)
66-# set entry
67-set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.")
68-
69-if(BUILD_PX7)
70- set(VMFILES ${VMFILES_PX7})
71- add_definitions(-D_PX7)
72- set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/px7.qrc)
73-elseif(BUILD_MSX2)
74- set(VMFILES ${VMFILES_MSX2})
75- add_definitions(-D_MSX2)
76- set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/msx2.qrc)
77-else()
78- set(VMFILES ${VMFILES_MSX1})
79- add_definitions(-D_MSX1)
80- set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/msx1.qrc)
81-endif()
82-
83-include(config_commonsource)
34+include(config_msx)
--- /dev/null
+++ b/source/build-cmake/msx2plus/CMakeLists.txt
@@ -0,0 +1,34 @@
1+# Build Common Sourcecode Project, Qt.
2+# (C) 2014 K.Ohta <whatisthis.sowhat@gmail.com>
3+# This is part of XM7/SDL, but license is apache 2.2,
4+# this part was written only me.
5+
6+cmake_minimum_required (VERSION 2.8)
7+cmake_policy(SET CMP0011 NEW)
8+
9+message("")
10+message("** Start of configure CommonSourceProject,MSX2, Qt **")
11+message("")
12+
13+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
14+
15+project (emumsx2plus)
16+set(EXEC_TARGET emumsx2plus)
17+set(VM_NAME msx)
18+set(USE_FMGEN ON)
19+set(WITH_JOYSTICK ON)
20+set(WITH_MOUSE ON)
21+
22+set(BUILD_PX7 OFF CACHE BOOL "Build for Pioneer PX7")
23+set(BUILD_MSX1 OFF CACHE BOOL "Build for MSX1")
24+set(BUILD_MSX2 OFF CACHE BOOL "Build for MSX2")
25+set(BUILD_MSX2PLUS ON CACHE BOOL "Build for MSX2+")
26+set(BUILD_HX20 OFF CACHE BOOL "Build for Toshiba HX-20")
27+set(BUILD_FSA1 OFF CACHE BOOL "Build for Panasonic FS-A1")
28+set(BUILD_HBF1XDJ OFF CACHE BOOL "Build for Sony HB-F1XDJ")
29+
30+set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
31+set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
32+set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
33+
34+include(config_msx)
--- a/source/build-cmake/px7/CMakeLists.txt
+++ b/source/build-cmake/px7/CMakeLists.txt
@@ -19,68 +19,16 @@ set(USE_FMGEN ON)
1919 set(WITH_JOYSTICK ON)
2020 set(WITH_MOUSE ON)
2121
22-set(VMFILES_BASE
23- z80.cpp
24- tms9918a.cpp
25-
26- i8255.cpp
27-
28- ym2203.cpp
29- #
30- datarec.cpp
31- event.cpp
32- io.cpp
33- memory.cpp
34-)
35-set(VMFILES_LIB
36- pcm1bit.cpp
37- not.cpp
38-)
39-
40-
4122 set(BUILD_PX7 ON CACHE BOOL "Build for Pioneer PX7")
4223 set(BUILD_MSX1 OFF CACHE BOOL "Build for MSX1")
4324 set(BUILD_MSX2 OFF CACHE BOOL "Build for MSX2")
25+set(BUILD_MSX2PLUS OFF CACHE BOOL "Build for MSX2+")
26+set(BUILD_HX20 OFF CACHE BOOL "Build for Toshiba HX-20")
27+set(BUILD_FSA1 OFF CACHE BOOL "Build for Panasonic FS-A1")
28+set(BUILD_HBF1XDJ OFF CACHE BOOL "Build for Sony HB-F1XDJ")
29+
4430 set(USE_OPENMP ON CACHE BOOL "Build using OpenMP")
4531 set(USE_OPENGL ON CACHE BOOL "Build using OpenGL")
4632 set(WITH_DEBUGGER ON CACHE BOOL "Build with debugger.")
4733
48-set(VMFILES_MSX2 ${VMFILES_BASE}
49- rp5c01.cpp
50- v99x8.cpp
51- disk.cpp
52-)
53-
54-set(VMFILES_MSX1 ${VMFILES_BASE}
55- tms9918a.cpp
56- disk.cpp
57-)
58-
59-set(VMFILES_PX7 ${VMFILES_BASE}
60- tms9918a.cpp
61- ld700.cpp
62-)
63-
64-if(USE_CMT_SOUND)
65- set(VMFILES_MSX ${VMFILES_BASE})
66-endif()
67-
68-include(detect_target_cpu)
69-# set entry
70-set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.")
71-
72-if(BUILD_PX7)
73- set(VMFILES ${VMFILES_PX7})
74- add_definitions(-D_PX7)
75- set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/px7.qrc)
76-elseif(BUILD_MSX2)
77- set(VMFILES ${VMFILES_MSX2})
78- add_definitions(-D_MSX2)
79- set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/msx2.qrc)
80-else()
81- set(VMFILES ${VMFILES_MSX1})
82- add_definitions(-D_MSX1)
83- set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/msx1.qrc)
84-endif()
85-
86-include(config_commonsource)
34+include(config_msx)
--- a/source/src/qt/common/qrc/commontexts.qrc
+++ b/source/src/qt/common/qrc/commontexts.qrc
@@ -4,7 +4,7 @@
44 <file alias="readme.txt">../../../../readme.txt</file>
55 <file alias="readme.qt.txt">../../../../readme.qt.txt</file>
66 <file alias="readme_by_mr_tanam.txt">../../../../readme_by_mr_tanam.txt</file>
7- <file alias="readme_by_umaiboux.txt">../../../../readme_by_umaiboux.txt</file>
7+ <file alias="readme_by_umaiboux.txt">../../../../readme_by_mr_umaiboux.txt</file>
88 <file alias="readme_by_artane.txt">../../../../readme_by_artane.txt</file>
99 <file alias="readme_fm7.txt">../../../../readme_fm7.txt</file>
1010 <file alias="readme_fm7.jp.txt">../../../../readme_fm7.jp.txt</file>
--- /dev/null
+++ b/source/src/qt/common/qrc/fsa1.qrc
@@ -0,0 +1,6 @@
1+<!DOCTYPE RCC><RCC version="1.0">
2+<qresource>
3+ <file alias="default.ico">../../../res/fsa1.ico</file>
4+ <file alias="bios_and_keys.txt">../../../../../doc/VMs/px7.txt</file>
5+</qresource>
6+</RCC>
--- /dev/null
+++ b/source/src/qt/common/qrc/hbf1xdj.qrc
@@ -0,0 +1,6 @@
1+<!DOCTYPE RCC><RCC version="1.0">
2+<qresource>
3+ <file alias="default.ico">../../../res/hx20.ico</file>
4+ <file alias="bios_and_keys.txt">../../../../../doc/VMs/px7.txt</file>
5+</qresource>
6+</RCC>
--- /dev/null
+++ b/source/src/qt/common/qrc/hx20.qrc
@@ -0,0 +1,6 @@
1+<!DOCTYPE RCC><RCC version="1.0">
2+<qresource>
3+ <file alias="default.ico">../../../res/hx20.ico</file>
4+ <file alias="bios_and_keys.txt">../../../../../doc/VMs/px7.txt</file>
5+</qresource>
6+</RCC>
--- /dev/null
+++ b/source/src/qt/common/qrc/msx2plus.qrc
@@ -0,0 +1,6 @@
1+<!DOCTYPE RCC><RCC version="1.0">
2+<qresource>
3+ <file alias="default.ico">../../../res/msx2p.ico</file>
4+ <file alias="bios_and_keys.txt">../../../../../doc/VMs/px7.txt</file>
5+</qresource>
6+</RCC>
--- a/source/src/qt/gui/menu_main.cpp
+++ b/source/src/qt/gui/menu_main.cpp
@@ -1013,7 +1013,7 @@ void Ui_MainWindowBase::retranslateUI_Help(void)
10131013 actionHelp_README->setText(QApplication::translate("MainWindow", "General Document", 0));
10141014 actionHelp_README_QT->setText(QApplication::translate("MainWindow", "About Qt ports", 0));
10151015 actionHelp_README_Artane->setText(QApplication::translate("MainWindow", "About Qt ports (Japanese).", 0));
1016- actionHelp_README_Umayboux->setText(QApplication::translate("MainWindow", "By Mr. Umaiboux.", 0));
1016+ actionHelp_README_Umaiboux->setText(QApplication::translate("MainWindow", "By Mr. Umaiboux.", 0));
10171017 actionHelp_README_MR_TANAM->setText(QApplication::translate("MainWindow", "By Mr. tanam", 0));
10181018 actionHelp_README_FM7->setText(QApplication::translate("MainWindow", "About eFM-7/8/77/AV.", 0));
10191019 actionHelp_README_FM7_JP->setText(QApplication::translate("MainWindow", "About eFM-7/8/77/AV (Japanese).", 0));
--- a/source/src/vm/common_vm/CMakeLists.txt
+++ b/source/src/vm/common_vm/CMakeLists.txt
@@ -95,8 +95,8 @@ else()
9595 ${s_vm_common_vm_srcs}
9696 )
9797 set_target_properties(CSPcommon_vm PROPERTIES
98- SOVERSION 1.0.1
99- VERSION 1.0.1
98+ SOVERSION 1.0.2
99+ VERSION 1.0.2
100100 )
101101 INSTALL(TARGETS CSPcommon_vm DESTINATION ${LIBCSP_INSTALL_DIR})
102102 endif()
--- a/source/src/vm/disk.h
+++ b/source/src/vm/disk.h
@@ -74,7 +74,7 @@ private:
7474 bool is_solid_image;
7575 bool is_fdi_image;
7676 uint8_t fdi_header[4096];
77- _TCHAR this_device_name[128];
77+ //_TCHAR this_device_name[128];
7878
7979 int solid_ncyl, solid_nside, solid_nsec, solid_size;
8080 bool solid_mfm;
--- a/source/src/vm/msx/CMakeLists.txt
+++ b/source/src/vm/msx/CMakeLists.txt
@@ -5,24 +5,73 @@ message("* vm/msx1")
55 if(BUILD_PX7)
66 add_library(vm_msx
77 joystick.cpp
8+ kanjirom.cpp
89 keyboard.cpp
9- memory.cpp
10- msx.cpp
10+ memory_ex.cpp
11+ printer.cpp
12+ scc.cpp
13+ sound_cart.cpp
14+ msx_ex.cpp
1115 )
1216 elseif(BUILD_MSX2)
1317 add_library(vm_msx
1418 joystick.cpp
19+ kanjirom.cpp
1520 keyboard.cpp
16- memory.cpp
21+ memory_ex.cpp
1722 rtcif.cpp
18- msx.cpp
19- )
23+ printer.cpp
24+ scc.cpp
25+ sound_cart.cpp
26+ msx_ex.cpp
27+ )
28+elseif(BUILD_MSX2PLUS)
29+ add_library(vm_msx
30+ joystick.cpp
31+ kanjirom.cpp
32+ keyboard.cpp
33+ memory_ex.cpp
34+ rtcif.cpp
35+ printer.cpp
36+ scc.cpp
37+ sound_cart.cpp
38+ msx_ex.cpp
39+ )
40+elseif(BUILD_FSA1)
41+ add_library(vm_msx
42+ joystick.cpp
43+ keyboard.cpp
44+ kanjirom.cpp
45+ memory_ex.cpp
46+ rtcif.cpp
47+ printer.cpp
48+ scc.cpp
49+ sound_cart.cpp
50+ msx_ex.cpp
51+ )
52+elseif(BUILD_HX20)
53+ add_library(vm_msx
54+ joystick.cpp
55+ keyboard.cpp
56+ kanjirom.cpp
57+ memory_ex.cpp
58+ rtcif.cpp
59+ printer.cpp
60+ scc.cpp
61+ sound_cart.cpp
62+ psg_stereo.cpp
63+ msx_ex.cpp
64+ )
2065 else()
2166 add_library(vm_msx
2267 joystick.cpp
68+ kanjirom.cpp
2369 keyboard.cpp
24- memory.cpp
25- msx.cpp
70+ memory_ex.cpp
71+ printer.cpp
72+ scc.cpp
73+ sound_cart.cpp
74+ msx_ex.cpp
2675 )
2776 endif()
2877
--- a/source/src/vm/msx/msx.cpp
+++ b/source/src/vm/msx/msx.cpp
@@ -56,18 +56,12 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
5656 first_device = last_device = NULL;
5757 dummy = new DEVICE(this, emu); // must be 1st device
5858 event = new EVENT(this, emu); // must be 2nd device
59-#if defined(_USE_QT)
6059 dummy->set_device_name(_T("1st Dummy"));
6160 event->set_device_name(_T("EVENT"));
62-#endif
6361
6462 drec = new DATAREC(this, emu);
6563 pio = new I8255(this, emu);
6664 io = new IO(this, emu);
67-#if defined(_USE_QT)
68- pio->set_device_name(_T("i8255 PIO"));
69- io->set_device_name(_T("I/O BUS"));
70-#endif
7165 #if defined(_PX7)
7266 ldp = new LD700(this, emu);
7367 #endif
@@ -75,52 +69,31 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
7569 // psg = new YM2203(this, emu);
7670 psg = new AY_3_891X(this, emu);
7771 pcm = new PCM1BIT(this, emu);
78-#if defined(_USE_QT)
79- not_remote->set_device_name(_T("NOT GATE(REMOTE)"));
80- psg->set_device_name(_T("AY-3-8910 PSG"));
81- pcm->set_device_name(_T("PCM BUZZER"));
82-#endif
72+ not_remote->set_device_name(_T("NOT Gate (REMOTE)"));
73+
8374 #if defined(_MSX2)
8475 rtc = new RP5C01(this, emu);
8576 vdp = new V99X8(this, emu);
86- #if defined(_USE_QT)
87- rtc->set_device_name(_T("RP5C01 RTC"));
88- vdp->set_device_name(_T("V99x8 VDP"));
89- #endif
9077 #else
9178 vdp = new TMS9918A(this, emu);
92- #if defined(_USE_QT)
93- vdp->set_device_name(_T("TMS9918 VDP"));
94- #endif
9579 #endif
9680 cpu = new Z80(this, emu);
97-#if defined(_USE_QT)
98- cpu->set_device_name(_T("CPU(Z80)"));
99-#endif
10081 joystick = new JOYSTICK(this, emu);
10182 keyboard = new KEYBOARD(this, emu);
10283 memory = new MEMORY(this, emu);
10384 #if defined(_MSX2)
10485 rtcif = new RTCIF(this, emu);
10586 #endif
106-#if defined(_USE_QT)
107- joystick->set_device_name(_T("JOYSTICK I/F"));
108- keyboard->set_device_name(_T("KEYBOARD I/F"));
109- memory->set_device_name(_T("MEMORY"));
110- #if defined(_MSX2)
111- rtcif->set_device_name(_T("RTC I/F"));
112- #endif
113-#endif
11487 slot0 = new SLOT0(this, emu); // #0: main memory
11588 slot1 = new SLOT1(this, emu); // #1: rom-cartridge or msx-dos
11689 slot2 = new SLOT2(this, emu); // #2: fdd-cartridge or p-basic
11790 slot3 = new SLOT3(this, emu); // #3: rom-cartridge or ram-cartridge
118-#if defined(_USE_QT)
91+
11992 slot0->set_device_name(_T("SLOT#0 MAIN MEMORY"));
12093 slot1->set_device_name(_T("SLOT#1 ROM CARTRIDGE"));
12194 slot2->set_device_name(_T("SLOT#2 FDD CARTRIDGE"));
12295 slot3->set_device_name(_T("SLOT#3 ROM CARTRIDGE"));
123-#endif
96+
12497 // set contexts
12598 event->set_context_cpu(cpu);
12699 event->set_context_sound(psg);
Show on old repository browser