From 4c784aa271c286a239392a58a3185b5e032fcb84 Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Mon, 28 Dec 2015 15:20:03 +0900 Subject: [PATCH] [VM][OSD][Qt] Do not build and launch when VM has not using Joystick. --- source/build-cmake/babbage2nd/CMakeLists.txt | 4 +- source/build-cmake/cmake/config_commonsource.cmake | 13 ++++-- source/build-cmake/cmake/config_emufm7.cmake | 3 ++ source/build-cmake/cmake/config_emufmr50.cmake | 2 + .../build-cmake/cmake/config_emumastersystem.cmake | 2 + source/build-cmake/cmake/config_emupasopia.cmake | 2 + source/build-cmake/cmake/config_emupc9801.cmake | 2 + source/build-cmake/cmake/config_mz2500.cmake | 2 + source/build-cmake/cmake/config_mz5500.cmake | 3 ++ source/build-cmake/cmake/config_mz700.cmake | 2 + source/build-cmake/cmake/config_mz80.cmake | 2 + source/build-cmake/cmake/config_pc6001.cmake | 3 ++ source/build-cmake/cmake/config_pc8201.cmake | 2 + source/build-cmake/cmake/config_pc8801.cmake | 3 ++ source/build-cmake/cmake/config_pc98ha.cmake | 3 ++ source/build-cmake/cmake/config_qc10.cmake | 2 + source/build-cmake/cmake/config_x1.cmake | 3 ++ source/build-cmake/ex80/CMakeLists.txt | 3 ++ source/build-cmake/familybasic/CMakeLists.txt | 3 ++ source/build-cmake/fm16pi/CMakeLists.txt | 3 ++ source/build-cmake/fp1100/CMakeLists.txt | 2 + source/build-cmake/fp200/CMakeLists.txt | 3 ++ source/build-cmake/hc20/CMakeLists.txt | 3 ++ source/build-cmake/hc40/CMakeLists.txt | 2 + source/build-cmake/hc80/CMakeLists.txt | 2 + source/build-cmake/j3100gt/CMakeLists.txt | 2 + source/build-cmake/j3100sl/CMakeLists.txt | 3 ++ source/build-cmake/jr100/CMakeLists.txt | 3 ++ source/build-cmake/jx/CMakeLists.txt | 3 ++ source/build-cmake/m5/CMakeLists.txt | 3 ++ source/build-cmake/map1010/CMakeLists.txt | 2 + source/build-cmake/mz3500/CMakeLists.txt | 3 ++ source/build-cmake/n5200/CMakeLists.txt | 3 ++ source/build-cmake/pc100/CMakeLists.txt | 3 ++ source/build-cmake/pcengine/CMakeLists.txt | 3 ++ source/build-cmake/rx78/CMakeLists.txt | 3 ++ source/build-cmake/sc3000/CMakeLists.txt | 3 ++ source/build-cmake/scv/CMakeLists.txt | 3 ++ source/build-cmake/tk80bs/CMakeLists.txt | 2 + source/build-cmake/x07/CMakeLists.txt | 2 + source/build-cmake/ys6464a/CMakeLists.txt | 3 ++ source/src/qt/common/CMakeLists.txt | 8 +++- source/src/qt/common/joy_thread.cpp | 53 +++++++++++++++------- source/src/qt/common/joy_thread.h | 9 +++- source/src/qt/common/qt_gldraw.h | 2 + source/src/qt/common/qt_glevents.cpp | 17 ++++--- source/src/qt/common/qt_main.cpp | 8 ++++ source/src/qt/gui/mainwidget.h | 2 + source/src/vm/fm7/fm7.h | 6 ++- source/src/vm/gamegear/gamegear.h | 1 + source/src/vm/gamegear/mastersystem.h | 1 + source/src/vm/m5/m5.h | 1 + source/src/vm/msx/msx.h | 1 + source/src/vm/mz2500/mz2500.h | 2 + source/src/vm/mz2800/mz2800.h | 2 + source/src/vm/mz5500/mz5500.h | 2 + source/src/vm/mz700/mz700.h | 1 + source/src/vm/pc100/pc100.h | 1 + source/src/vm/pc6001/pc6001.h | 2 + source/src/vm/pc8801/pc8801.h | 2 + source/src/vm/pc9801/pc9801.h | 2 + source/src/vm/phc25/phc25.h | 2 + source/src/vm/pv1000/pv1000.h | 2 + source/src/vm/pv2000/pv2000.h | 1 + source/src/vm/pyuta/pyuta.h | 1 + source/src/vm/rx78/rx78.h | 1 + source/src/vm/sc3000/sc3000.h | 1 + source/src/vm/scv/scv.h | 1 + source/src/vm/smc777/smc777.h | 2 + source/src/vm/x1/x1.h | 3 ++ source/src/vm/z80tvgame/z80tvgame.h | 1 + 71 files changed, 220 insertions(+), 36 deletions(-) diff --git a/source/build-cmake/babbage2nd/CMakeLists.txt b/source/build-cmake/babbage2nd/CMakeLists.txt index 08df1bcca..862ec5974 100644 --- a/source/build-cmake/babbage2nd/CMakeLists.txt +++ b/source/build-cmake/babbage2nd/CMakeLists.txt @@ -17,6 +17,9 @@ project (emubabbage2nd) set(EXEC_TARGET emubabbage2nd) set(VM_NAME babbage2nd) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) + set(VMFILES_BASE z80.cpp z80ctc.cpp @@ -42,5 +45,4 @@ set(VMFILES ${VMFILES_BASE}) add_definitions(-D_BABBAGE2ND) set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/babbage2nd.qrc) - include(config_commonsource) diff --git a/source/build-cmake/cmake/config_commonsource.cmake b/source/build-cmake/cmake/config_commonsource.cmake index cc96e62fb..9df535caa 100644 --- a/source/build-cmake/cmake/config_commonsource.cmake +++ b/source/build-cmake/cmake/config_commonsource.cmake @@ -47,6 +47,12 @@ add_definitions(-DUSE_QT) add_definitions(-DQT_MAJOR_VERSION=${Qt5Widgets_VERSION_MAJOR}) add_definitions(-DQT_MINOR_VERSION=${Qt5Widgets_VERSION_MINOR}) # Build Flags +if(WITH_JOYSTICK) +endif() + +if(WITH_MOUSE) +endif() + if(USE_OPENMP) find_package(OpenMP) @@ -131,13 +137,14 @@ add_subdirectory(../../src common) add_subdirectory(../../src/vm vm/) if(DEFINED VM_NAME) -if(WITH_DEBUGGER) + if(WITH_DEBUGGER) set(DEBUG_LIBS qt_debugger) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/debugger) add_subdirectory(../../src/qt/debugger qt/debugger) -else() + else() set(DEBUG_LIBS) -endif() + endif() + set(LOCAL_LIBS common_emu qt_${VM_NAME} diff --git a/source/build-cmake/cmake/config_emufm7.cmake b/source/build-cmake/cmake/config_emufm7.cmake index b0d71c01a..00103020c 100644 --- a/source/build-cmake/cmake/config_emufm7.cmake +++ b/source/build-cmake/cmake/config_emufm7.cmake @@ -10,6 +10,9 @@ message("") set(VM_NAME fm7) set(USE_FMGEN ON) set(WITH_DEBUGGER ON) +set(WITH_MOUSE ON) +set(WITH_JOYSTICK ON) + set(VMFILES mc6809.cpp # diff --git a/source/build-cmake/cmake/config_emufmr50.cmake b/source/build-cmake/cmake/config_emufmr50.cmake index 03f11553e..a3bc90e67 100644 --- a/source/build-cmake/cmake/config_emufmr50.cmake +++ b/source/build-cmake/cmake/config_emufmr50.cmake @@ -8,6 +8,8 @@ cmake_policy(SET CMP0011 NEW) set(VM_NAME fmr50) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) set(VMFILES # diff --git a/source/build-cmake/cmake/config_emumastersystem.cmake b/source/build-cmake/cmake/config_emumastersystem.cmake index 6a37dd4f7..5f86dd6f7 100644 --- a/source/build-cmake/cmake/config_emumastersystem.cmake +++ b/source/build-cmake/cmake/config_emumastersystem.cmake @@ -7,6 +7,8 @@ cmake_minimum_required (VERSION 2.8) cmake_policy(SET CMP0011 NEW) set(VM_NAME gamegear) set(USE_FMGEN ON) +set(WITH_MOUSE OFF) +set(WITH_JOYSTICK ON) set(VMFILES z80.cpp diff --git a/source/build-cmake/cmake/config_emupasopia.cmake b/source/build-cmake/cmake/config_emupasopia.cmake index c8cba639f..3e6a88c00 100644 --- a/source/build-cmake/cmake/config_emupasopia.cmake +++ b/source/build-cmake/cmake/config_emupasopia.cmake @@ -7,6 +7,8 @@ message("") message("** Start of configure CommonSourceProject,PASOPIA/7, Qt **") message("") +set(WITH_JOYSTICK ON) +set(WITH_MOUSE OFF) set(VMFILES z80.cpp diff --git a/source/build-cmake/cmake/config_emupc9801.cmake b/source/build-cmake/cmake/config_emupc9801.cmake index aac132c8b..474752413 100644 --- a/source/build-cmake/cmake/config_emupc9801.cmake +++ b/source/build-cmake/cmake/config_emupc9801.cmake @@ -1,6 +1,8 @@ set(VM_NAME pc9801) set(USE_FMGEN ON) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) set(VMFILES i8237.cpp diff --git a/source/build-cmake/cmake/config_mz2500.cmake b/source/build-cmake/cmake/config_mz2500.cmake index 0095f82b4..50f435b8e 100644 --- a/source/build-cmake/cmake/config_mz2500.cmake +++ b/source/build-cmake/cmake/config_mz2500.cmake @@ -8,6 +8,8 @@ cmake_policy(SET CMP0011 NEW) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") set(VM_NAME mz2500) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) set(VMFILES_2500 z80.cpp diff --git a/source/build-cmake/cmake/config_mz5500.cmake b/source/build-cmake/cmake/config_mz5500.cmake index 309e988d9..4c0428fbc 100644 --- a/source/build-cmake/cmake/config_mz5500.cmake +++ b/source/build-cmake/cmake/config_mz5500.cmake @@ -3,6 +3,9 @@ cmake_policy(SET CMP0011 NEW) set(VM_NAME mz5500) set(USE_FMGEN ON) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES i286.cpp diff --git a/source/build-cmake/cmake/config_mz700.cmake b/source/build-cmake/cmake/config_mz700.cmake index 159a05e4a..05b823c07 100644 --- a/source/build-cmake/cmake/config_mz700.cmake +++ b/source/build-cmake/cmake/config_mz700.cmake @@ -6,6 +6,8 @@ cmake_minimum_required (VERSION 2.8) cmake_policy(SET CMP0011 NEW) set(VM_NAME mz700) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) set(VMFILES_BASE z80.cpp diff --git a/source/build-cmake/cmake/config_mz80.cmake b/source/build-cmake/cmake/config_mz80.cmake index 33f308983..90d59972c 100644 --- a/source/build-cmake/cmake/config_mz80.cmake +++ b/source/build-cmake/cmake/config_mz80.cmake @@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") set(VM_NAME mz80k) set(USE_FMGEN OFF) set(USE_DEBUGGER ON) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE OFF) set(VMFILES_BASE z80.cpp diff --git a/source/build-cmake/cmake/config_pc6001.cmake b/source/build-cmake/cmake/config_pc6001.cmake index 6a726f6ba..5790c759f 100644 --- a/source/build-cmake/cmake/config_pc6001.cmake +++ b/source/build-cmake/cmake/config_pc6001.cmake @@ -9,6 +9,9 @@ cmake_policy(SET CMP0011 NEW) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") set(VM_NAME pc6001) set(USE_FMGEN ON) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES z80.cpp i8255.cpp diff --git a/source/build-cmake/cmake/config_pc8201.cmake b/source/build-cmake/cmake/config_pc8201.cmake index 3df5e47e8..88f67abfe 100644 --- a/source/build-cmake/cmake/config_pc8201.cmake +++ b/source/build-cmake/cmake/config_pc8201.cmake @@ -8,6 +8,8 @@ cmake_policy(SET CMP0011 NEW) set(VM_NAME pc8201) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE OFF) set(VMFILES i8080.cpp i8155.cpp diff --git a/source/build-cmake/cmake/config_pc8801.cmake b/source/build-cmake/cmake/config_pc8801.cmake index af0d3b08c..bc1601003 100644 --- a/source/build-cmake/cmake/config_pc8801.cmake +++ b/source/build-cmake/cmake/config_pc8801.cmake @@ -4,6 +4,9 @@ cmake_policy(SET CMP0011 NEW) set(VM_NAME pc8801) set(USE_FMGEN ON) set(USE_DEBUGGER ON) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES z80.cpp z80dma.cpp diff --git a/source/build-cmake/cmake/config_pc98ha.cmake b/source/build-cmake/cmake/config_pc98ha.cmake index ba4f8ce26..5f0d5c77d 100644 --- a/source/build-cmake/cmake/config_pc98ha.cmake +++ b/source/build-cmake/cmake/config_pc98ha.cmake @@ -1,6 +1,9 @@ set(VM_NAME pc98ha) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES i8251.cpp i8253.cpp diff --git a/source/build-cmake/cmake/config_qc10.cmake b/source/build-cmake/cmake/config_qc10.cmake index 1c95ee593..fc20408a2 100644 --- a/source/build-cmake/cmake/config_qc10.cmake +++ b/source/build-cmake/cmake/config_qc10.cmake @@ -1,5 +1,7 @@ set(VM_NAME qc10) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE OFF) set(VMFILES z80.cpp diff --git a/source/build-cmake/cmake/config_x1.cmake b/source/build-cmake/cmake/config_x1.cmake index ffd4308ae..22d0ab92a 100644 --- a/source/build-cmake/cmake/config_x1.cmake +++ b/source/build-cmake/cmake/config_x1.cmake @@ -10,6 +10,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") set(VM_NAME x1) set(USE_FMGEN ON) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES z80.cpp mcs48.cpp diff --git a/source/build-cmake/ex80/CMakeLists.txt b/source/build-cmake/ex80/CMakeLists.txt index 97b2ce1d8..1a044c216 100644 --- a/source/build-cmake/ex80/CMakeLists.txt +++ b/source/build-cmake/ex80/CMakeLists.txt @@ -17,6 +17,9 @@ project (emuex80) set(EXEC_TARGET emuex80) set(VM_NAME ex80) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) + set(VMFILES_BASE i8080.cpp i8251.cpp diff --git a/source/build-cmake/familybasic/CMakeLists.txt b/source/build-cmake/familybasic/CMakeLists.txt index 668ac018d..a040091e5 100644 --- a/source/build-cmake/familybasic/CMakeLists.txt +++ b/source/build-cmake/familybasic/CMakeLists.txt @@ -18,6 +18,9 @@ project (emufamilybasic) set(EXEC_TARGET emufamilybasic) set(VM_NAME familybasic) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES_BASE m6502.cpp datarec.cpp diff --git a/source/build-cmake/fm16pi/CMakeLists.txt b/source/build-cmake/fm16pi/CMakeLists.txt index b43b383de..25424f088 100644 --- a/source/build-cmake/fm16pi/CMakeLists.txt +++ b/source/build-cmake/fm16pi/CMakeLists.txt @@ -17,6 +17,9 @@ project (emufm16pi) set(EXEC_TARGET emufm16pi) set(VM_NAME fm16pi) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) + set(VMFILES i286.cpp # diff --git a/source/build-cmake/fp1100/CMakeLists.txt b/source/build-cmake/fp1100/CMakeLists.txt index d988ebe01..99f1442b0 100644 --- a/source/build-cmake/fp1100/CMakeLists.txt +++ b/source/build-cmake/fp1100/CMakeLists.txt @@ -16,6 +16,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (emufp1100) set(VM_NAME fp1100) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE OFF) set(VMFILES z80.cpp diff --git a/source/build-cmake/fp200/CMakeLists.txt b/source/build-cmake/fp200/CMakeLists.txt index 4bd5499a9..9abb67730 100644 --- a/source/build-cmake/fp200/CMakeLists.txt +++ b/source/build-cmake/fp200/CMakeLists.txt @@ -16,6 +16,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (emufp200) set(VM_NAME fp200) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE OFF) + set(VMFILES i8080.cpp rp5c01.cpp diff --git a/source/build-cmake/hc20/CMakeLists.txt b/source/build-cmake/hc20/CMakeLists.txt index 6a90d62e5..ce04c2fa4 100644 --- a/source/build-cmake/hc20/CMakeLists.txt +++ b/source/build-cmake/hc20/CMakeLists.txt @@ -18,6 +18,9 @@ project (emuhc20) set(EXEC_TARGET emuhc20) set(VM_NAME hc20) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE OFF) + set(VMFILES_BASE mc6800.cpp tf20.cpp diff --git a/source/build-cmake/hc40/CMakeLists.txt b/source/build-cmake/hc40/CMakeLists.txt index 537f010d7..d0a60eb37 100644 --- a/source/build-cmake/hc40/CMakeLists.txt +++ b/source/build-cmake/hc40/CMakeLists.txt @@ -18,6 +18,8 @@ project (emuhc40) set(EXEC_TARGET emuhc40) set(VM_NAME hc40) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE OFF) set(VMFILES_BASE z80.cpp diff --git a/source/build-cmake/hc80/CMakeLists.txt b/source/build-cmake/hc80/CMakeLists.txt index 0eecafdd1..2bf83f398 100644 --- a/source/build-cmake/hc80/CMakeLists.txt +++ b/source/build-cmake/hc80/CMakeLists.txt @@ -18,6 +18,8 @@ set(VM_NAME hc80) set(USE_FMGEN OFF) set(EXEC_TARGET emuhc80) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE OFF) set(VMFILES_BASE z80.cpp diff --git a/source/build-cmake/j3100gt/CMakeLists.txt b/source/build-cmake/j3100gt/CMakeLists.txt index d2f343ab3..be3445651 100644 --- a/source/build-cmake/j3100gt/CMakeLists.txt +++ b/source/build-cmake/j3100gt/CMakeLists.txt @@ -16,6 +16,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (emuj3100gt) set(VM_NAME j3100) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) set(VMFILES hd46505.cpp diff --git a/source/build-cmake/j3100sl/CMakeLists.txt b/source/build-cmake/j3100sl/CMakeLists.txt index 265c1a649..66322c75c 100644 --- a/source/build-cmake/j3100sl/CMakeLists.txt +++ b/source/build-cmake/j3100sl/CMakeLists.txt @@ -16,6 +16,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (emuj3100sl) set(VM_NAME j3100) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) + set(VMFILES hd46505.cpp i8237.cpp diff --git a/source/build-cmake/jr100/CMakeLists.txt b/source/build-cmake/jr100/CMakeLists.txt index c0d30e990..058515690 100644 --- a/source/build-cmake/jr100/CMakeLists.txt +++ b/source/build-cmake/jr100/CMakeLists.txt @@ -18,6 +18,9 @@ project (emujr100) set(EXEC_TARGET emujr100) set(VM_NAME jr100) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE OFF) + set(VMFILES_BASE mc6800.cpp pcm1bit.cpp diff --git a/source/build-cmake/jx/CMakeLists.txt b/source/build-cmake/jx/CMakeLists.txt index fed6525cf..5066487c7 100644 --- a/source/build-cmake/jx/CMakeLists.txt +++ b/source/build-cmake/jx/CMakeLists.txt @@ -18,6 +18,9 @@ project (emujx) set(EXEC_TARGET emujx) set(VM_NAME jx) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES_BASE i86.cpp diff --git a/source/build-cmake/m5/CMakeLists.txt b/source/build-cmake/m5/CMakeLists.txt index 6635a8b3b..1dcf1ac78 100644 --- a/source/build-cmake/m5/CMakeLists.txt +++ b/source/build-cmake/m5/CMakeLists.txt @@ -18,6 +18,9 @@ project (emum5) set(EXEC_TARGET emum5) set(VM_NAME m5) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES_BASE z80.cpp sn76489an.cpp diff --git a/source/build-cmake/map1010/CMakeLists.txt b/source/build-cmake/map1010/CMakeLists.txt index 9e99e1f5a..5ff57d1c0 100644 --- a/source/build-cmake/map1010/CMakeLists.txt +++ b/source/build-cmake/map1010/CMakeLists.txt @@ -13,6 +13,8 @@ message("") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (map1010) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) set(BUILD_MAP1010 ON CACHE BOOL "Build eMAP1010") diff --git a/source/build-cmake/mz3500/CMakeLists.txt b/source/build-cmake/mz3500/CMakeLists.txt index 76523fb58..1a44e1e2f 100644 --- a/source/build-cmake/mz3500/CMakeLists.txt +++ b/source/build-cmake/mz3500/CMakeLists.txt @@ -15,6 +15,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (mz3500) set(VM_NAME mz3500) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) + set(VMFILES z80.cpp diff --git a/source/build-cmake/n5200/CMakeLists.txt b/source/build-cmake/n5200/CMakeLists.txt index 8890322e8..39dea918c 100644 --- a/source/build-cmake/n5200/CMakeLists.txt +++ b/source/build-cmake/n5200/CMakeLists.txt @@ -18,6 +18,9 @@ project (emun5200) set(EXEC_TARGET emun5200) set(VM_NAME n5200) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) + set(VMFILES_BASE i386.cpp diff --git a/source/build-cmake/pc100/CMakeLists.txt b/source/build-cmake/pc100/CMakeLists.txt index 9f495289f..b6b777979 100644 --- a/source/build-cmake/pc100/CMakeLists.txt +++ b/source/build-cmake/pc100/CMakeLists.txt @@ -15,6 +15,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (pc100) set(VM_NAME pc100) set(USE_FMGEN ON) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) + set(VMFILES i286.cpp diff --git a/source/build-cmake/pcengine/CMakeLists.txt b/source/build-cmake/pcengine/CMakeLists.txt index 1e96da614..ec5b5c3e7 100644 --- a/source/build-cmake/pcengine/CMakeLists.txt +++ b/source/build-cmake/pcengine/CMakeLists.txt @@ -16,6 +16,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (emupcengine) set(VM_NAME pcengine) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE OFF) + set(VMFILES_BASE huc6280.cpp event.cpp diff --git a/source/build-cmake/rx78/CMakeLists.txt b/source/build-cmake/rx78/CMakeLists.txt index 82abbd6fe..64d6eea5d 100644 --- a/source/build-cmake/rx78/CMakeLists.txt +++ b/source/build-cmake/rx78/CMakeLists.txt @@ -15,6 +15,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (rx78) set(VM_NAME rx78) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES z80.cpp sn76489an.cpp diff --git a/source/build-cmake/sc3000/CMakeLists.txt b/source/build-cmake/sc3000/CMakeLists.txt index ec263a5c2..e097a5813 100644 --- a/source/build-cmake/sc3000/CMakeLists.txt +++ b/source/build-cmake/sc3000/CMakeLists.txt @@ -15,6 +15,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (sc3000) set(VM_NAME sc3000) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) + set(VMFILES z80.cpp diff --git a/source/build-cmake/scv/CMakeLists.txt b/source/build-cmake/scv/CMakeLists.txt index a5963b28e..24d17c5dd 100644 --- a/source/build-cmake/scv/CMakeLists.txt +++ b/source/build-cmake/scv/CMakeLists.txt @@ -15,6 +15,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (scv) set(VM_NAME scv) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE OFF) + set(VMFILES upd7801.cpp diff --git a/source/build-cmake/tk80bs/CMakeLists.txt b/source/build-cmake/tk80bs/CMakeLists.txt index 6628a96eb..ff8329bc5 100644 --- a/source/build-cmake/tk80bs/CMakeLists.txt +++ b/source/build-cmake/tk80bs/CMakeLists.txt @@ -16,6 +16,8 @@ project (emutk80bs) set(VM_NAME tk80bs) set(USE_FMGEN OFF) +set(WITH_JOYSTICK ON) +set(WITH_MOUSE ON) set(VMFILES_BASE i8080.cpp diff --git a/source/build-cmake/x07/CMakeLists.txt b/source/build-cmake/x07/CMakeLists.txt index ff59c041c..80f155cd4 100644 --- a/source/build-cmake/x07/CMakeLists.txt +++ b/source/build-cmake/x07/CMakeLists.txt @@ -16,6 +16,8 @@ project (emux07) set(VM_NAME x07) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) set(VMFILES_BASE z80.cpp diff --git a/source/build-cmake/ys6464a/CMakeLists.txt b/source/build-cmake/ys6464a/CMakeLists.txt index 852580a9e..6512c0581 100644 --- a/source/build-cmake/ys6464a/CMakeLists.txt +++ b/source/build-cmake/ys6464a/CMakeLists.txt @@ -18,6 +18,9 @@ project (emuys6464a) set(EXEC_TARGET emuys6464a) set(VM_NAME ys6464a) set(USE_FMGEN OFF) +set(WITH_JOYSTICK OFF) +set(WITH_MOUSE ON) + set(VMFILES_BASE z80.cpp i8255.cpp diff --git a/source/src/qt/common/CMakeLists.txt b/source/src/qt/common/CMakeLists.txt index 8e1341c9f..58d47c0c9 100644 --- a/source/src/qt/common/CMakeLists.txt +++ b/source/src/qt/common/CMakeLists.txt @@ -4,10 +4,14 @@ set(s_qt_common_headers qt_dialogs.h qt_gldraw.h emu_thread.h - joy_thread.h draw_thread.h ) +if(WITH_JOYSTICK) + set(QT_COMMON_JOYSTICK_SRC joy_thread.cpp) + set(s_qt_common_headers ${s_qt_common_headers} joy_thread.h) +endif() + if(USE_QT_5) QT5_WRAP_CPP(s_qt_common_headers_MOC ${s_qt_common_headers}) else() @@ -21,7 +25,6 @@ set(QT_COMMON_BASE emuevents_control.cpp qt_dialogs.cpp qt_main.cpp emu_thread.cpp - joy_thread.cpp draw_thread.cpp agar_logger.cpp ) @@ -38,6 +41,7 @@ endif() add_executable(${EXEC_TARGET} ${QT_COMMON_BASE} + ${QT_COMMON_JOYSTICK_SRC} ${s_qt_common_headers_MOC} ${s_qt_common_RCC} ) diff --git a/source/src/qt/common/joy_thread.cpp b/source/src/qt/common/joy_thread.cpp index 51993ef1a..10b45a48d 100644 --- a/source/src/qt/common/joy_thread.cpp +++ b/source/src/qt/common/joy_thread.cpp @@ -26,13 +26,14 @@ JoyThreadClass::JoyThreadClass(EMU *p, QObject *parent) : QThread(parent) int i, j; p_emu = p; +#if defined(USE_JOYSTICK) joy_num = SDL_NumJoysticks(); for(i = 0; i < 16; i++) { joyhandle[i] = NULL; -#if defined(USE_SDL2) +# if defined(USE_SDL2) for(j = 0; j < 16; j++) guid_list[i].data[j] = 0; for(j = 0; j < 16; j++) guid_assign[i].data[j] = 0; -#endif +# endif names[i] = QString::fromUtf8(""); } if(joy_num > 0) { @@ -41,13 +42,13 @@ JoyThreadClass::JoyThreadClass(EMU *p, QObject *parent) : QThread(parent) joyhandle[i] = SDL_JoystickOpen(i); if(joyhandle[i] != NULL) { -#if defined(USE_SDL2) +# if defined(USE_SDL2) guid_list[i] = SDL_JoystickGetGUID(joyhandle[i]); guid_assign[i] = SDL_JoystickGetGUID(joyhandle[i]); names[i] = QString::fromUtf8(SDL_JoystickNameForIndex(i)); -#else +# else names[i] = QString::fromUtf8(SDL_JoystickName(i)); -#endif +# endif AGAR_DebugLog(AGAR_LOG_DEBUG, "JoyThread : Joystick %d : %s.", i, names[i].toUtf8().data()); } } @@ -57,18 +58,34 @@ JoyThreadClass::JoyThreadClass(EMU *p, QObject *parent) : QThread(parent) AGAR_DebugLog(AGAR_LOG_DEBUG, "JoyThread : Any joysticks were not connected."); bRunThread = false; } +#else + joy_num = 0; + for(i = 0; i < 16; i++) { + joyhandle[i] = NULL; +# if defined(USE_SDL2) + for(j = 0; j < 16; j++) guid_list[i].data[j] = 0; + for(j = 0; j < 16; j++) guid_assign[i].data[j] = 0; +# endif + names[i] = QString::fromUtf8("None"); + } + AGAR_DebugLog(AGAR_LOG_DEBUG, "JoyThread : None launched because this VM has not supported joystick."); + bRunThread = false; +#endif // defined(USE_JOYSTICK) } JoyThreadClass::~JoyThreadClass() { +#if defined(USE_JOYSTICK) int i; for(i = 0; i < 16; i++) { if(joyhandle[i] != NULL) SDL_JoystickClose(joyhandle[i]); } AGAR_DebugLog(AGAR_LOG_DEBUG, "JoyThread : EXIT"); +#endif } +#if defined(USE_JOYSTICK) void JoyThreadClass::x_axis_changed(int index, int value) { if(p_emu == NULL) return; @@ -158,9 +175,9 @@ bool JoyThreadClass::EventSDL(SDL_Event *eventQueue) int vk; uint32_t sym; uint32_t mod; -#if defined(USE_SDL2) +# if defined(USE_SDL2) SDL_JoystickGUID guid; -#endif +# endif int i; if(eventQueue == NULL) return false; /* @@ -171,7 +188,7 @@ bool JoyThreadClass::EventSDL(SDL_Event *eventQueue) value = eventQueue->jaxis.value; i = eventQueue->jaxis.which; -#if defined(USE_SDL2) +# if defined(USE_SDL2) guid = SDL_JoystickGetDeviceGUID(i); if(!CheckJoyGUID(&guid)) break; for(i = 0; i < 2; i++) { @@ -183,18 +200,18 @@ bool JoyThreadClass::EventSDL(SDL_Event *eventQueue) } } } -#else +# else if(eventQueue->jaxis.axis == 0) { // X x_axis_changed(i, value); } else if(eventQueue->jaxis.axis == 1) { // Y y_axis_changed(i, value); } -#endif +# endif break; case SDL_JOYBUTTONDOWN: button = eventQueue->jbutton.button; i = eventQueue->jbutton.which; -#if defined(USE_SDL2) +# if defined(USE_SDL2) guid = SDL_JoystickGetDeviceGUID(i); if(!CheckJoyGUID(&guid)) break; for(i = 0; i < 2; i++) { @@ -202,14 +219,14 @@ bool JoyThreadClass::EventSDL(SDL_Event *eventQueue) button_down(i, button); } } -#else +# else button_down(i, button); -#endif +# endif break; case SDL_JOYBUTTONUP: button = eventQueue->jbutton.button; i = eventQueue->jbutton.which; -#if defined(USE_SDL2) +# if defined(USE_SDL2) guid = SDL_JoystickGetDeviceGUID(i); if(!CheckJoyGUID(&guid)) break; for(i = 0; i < 2; i++) { @@ -217,19 +234,20 @@ bool JoyThreadClass::EventSDL(SDL_Event *eventQueue) button_up(i, button); } } -#else +# else button_up(i, button); -#endif +# endif break; default: break; } return true; } - +#endif // defined(USE_JOYSTICK) void JoyThreadClass::doWork(const QString ¶ms) { +#if defined(USE_JOYSTICK) do { if(bRunThread == false) { break; @@ -239,6 +257,7 @@ void JoyThreadClass::doWork(const QString ¶ms) } msleep(10); } while(1); +#endif this->quit(); } diff --git a/source/src/qt/common/joy_thread.h b/source/src/qt/common/joy_thread.h index a486d6af5..c3c7667f1 100644 --- a/source/src/qt/common/joy_thread.h +++ b/source/src/qt/common/joy_thread.h @@ -12,14 +12,16 @@ #include #include +#include "emu.h" class EMU; class QString; QT_BEGIN_NAMESPACE +#if defined(USE_JOYSTICK) class JoyThreadClass : public QThread { - Q_OBJECT + Q_OBJECT private: int joy_num; SDL_Event event; @@ -32,6 +34,7 @@ class JoyThreadClass : public QThread { EMU *p_emu; protected: bool bRunThread; +#if defined(USE_JOYSTICK) bool EventSDL(SDL_Event *); void x_axis_changed(int, int); void y_axis_changed(int, int); @@ -40,7 +43,8 @@ class JoyThreadClass : public QThread { #if defined(USE_SDL2) bool CheckJoyGUID(SDL_JoystickGUID *a); bool MatchJoyGUID(SDL_JoystickGUID *a, SDL_JoystickGUID *b); -#endif +#endif +#endif public: JoyThreadClass(EMU *p, QObject *parent = 0); ~JoyThreadClass(); @@ -55,6 +59,7 @@ public slots: int sig_finished(void); int call_joy_thread(EMU *); }; +#endif QT_END_NAMESPACE diff --git a/source/src/qt/common/qt_gldraw.h b/source/src/qt/common/qt_gldraw.h index 471065ecb..108f8912b 100644 --- a/source/src/qt/common/qt_gldraw.h +++ b/source/src/qt/common/qt_gldraw.h @@ -248,9 +248,11 @@ public slots: void update_screen(bitmap_t *); void resizeGL(int width, int height); +#if defined(ONE_BOARD_MICRO_COMPUTER) || defined(USE_MOUSE) void mouseMoveEvent(QMouseEvent *event); void mousePressEvent(QMouseEvent *event); void mouseReleaseEvent(QMouseEvent *event); +#endif void setEnableMouse(bool flag); void setSmoosing(bool); void setDrawGLGridVert(bool); diff --git a/source/src/qt/common/qt_glevents.cpp b/source/src/qt/common/qt_glevents.cpp index 546967bee..23b8aa726 100644 --- a/source/src/qt/common/qt_glevents.cpp +++ b/source/src/qt/common/qt_glevents.cpp @@ -35,9 +35,14 @@ void GLDrawClass::leaveEvent(QEvent *event) void GLDrawClass::setEnableMouse(bool enable) { +#if defined(ONE_BOARD_MICRO_COMPUTER) || defined(USE_MOUSE) enable_mouse = enable; +#else + enable_mouse = false; +#endif } +#if defined(ONE_BOARD_MICRO_COMPUTER) || defined(USE_MOUSE) void GLDrawClass::mouseMoveEvent(QMouseEvent *event) { int xpos = event->x(); @@ -45,14 +50,10 @@ void GLDrawClass::mouseMoveEvent(QMouseEvent *event) int d_ww, d_hh; int c_ww, c_hh; -#if !defined(ONE_BOARD_MICRO_COMPUTER) if(!enable_mouse) return; emit do_notify_move_mouse(xpos, ypos); -#endif } - - void GLDrawClass::mousePressEvent(QMouseEvent *event) { int xpos = event->x(); @@ -60,7 +61,6 @@ void GLDrawClass::mousePressEvent(QMouseEvent *event) int d_ww, d_hh; int c_ww, c_hh; -#if defined(ONE_BOARD_MICRO_COMPUTER) if((xpos < 0) || (ypos < 0)) return; //if(draw_width >= this->width()) { d_ww = this->width(); @@ -100,22 +100,20 @@ void GLDrawClass::mousePressEvent(QMouseEvent *event) ypos = ypos - up; double xx; double yy; -#if defined(USE_SCREEN_ROTATE) +# if defined(USE_SCREEN_ROTATE) if(config.rotate_type) { xx = (double)ypos * ((double)SCREEN_WIDTH / (double)d_hh); yy = (double)xpos * ((double)SCREEN_HEIGHT / (double)d_ww); } else -#endif +# endif { xx = (double)xpos * ((double)SCREEN_WIDTH / (double)d_ww); yy = (double)ypos * ((double)SCREEN_HEIGHT / (double)d_hh); } emit do_notify_move_mouse((int)xx, (int) yy); -#else if(!enable_mouse) return; emit do_notify_button_pressed(event->button()); if(event->button() == Qt::MiddleButton) emit sig_check_grab_mouse(true); -#endif } void GLDrawClass::mouseReleaseEvent(QMouseEvent *event) @@ -123,6 +121,7 @@ void GLDrawClass::mouseReleaseEvent(QMouseEvent *event) if(!enable_mouse) return; emit do_notify_button_released(event->button()); } +#endif void GLDrawClass::closeEvent(QCloseEvent *event) { diff --git a/source/src/qt/common/qt_main.cpp b/source/src/qt/common/qt_main.cpp index d97adbc87..3f202ef5d 100644 --- a/source/src/qt/common/qt_main.cpp +++ b/source/src/qt/common/qt_main.cpp @@ -330,14 +330,18 @@ void Ui_MainWindow::delete_emu_thread(void) void Ui_MainWindow::LaunchJoyThread(void) { +#if defined(USE_JOYSTICK) hRunJoy = new JoyThreadClass(emu, this); connect(this, SIGNAL(quit_joy_thread()), hRunJoy, SLOT(doExit())); hRunJoy->setObjectName("JoyThread"); hRunJoy->start(); +#endif } void Ui_MainWindow::StopJoyThread(void) { +#if defined(USE_JOYSTICK) emit quit_joy_thread(); +#endif } void Ui_MainWindow::delete_joy_thread(void) @@ -499,10 +503,12 @@ void Ui_MainWindow::OnMainWindowClosed(void) hRunEmu->wait(); delete hRunEmu; } +#if defined(USE_JOYSTICK) if(hRunJoy != NULL) { hRunJoy->wait(); delete hRunJoy; } +#endif do_release_emu_resources(); // release window @@ -604,7 +610,9 @@ int MainLoop(int argc, char *argv[]) pgl->setEmuPtr(emu); pgl->setFixedSize(pgl->width(), pgl->height()); +#if defined(USE_JOYSTICK) rMainWindow->LaunchJoyThread(); +#endif rMainWindow->LaunchEmuThread(); QObject::connect(GuiMain, SIGNAL(lastWindowClosed()), rMainWindow, SLOT(on_actionExit_triggered())); diff --git a/source/src/qt/gui/mainwidget.h b/source/src/qt/gui/mainwidget.h index a5d6690be..5a851e752 100644 --- a/source/src/qt/gui/mainwidget.h +++ b/source/src/qt/gui/mainwidget.h @@ -343,7 +343,9 @@ class Ui_MainWindow : public QMainWindow // Constructor class EmuThreadClass *hRunEmu; class DrawThreadClass *hDrawEmu; +#if defined(USE_JOYSTICK) class JoyThreadClass *hRunJoy; +#endif public: Ui_MainWindow(QWidget *parent = 0); ~Ui_MainWindow(); diff --git a/source/src/vm/fm7/fm7.h b/source/src/vm/fm7/fm7.h index 3c07ba517..f212b34f5 100644 --- a/source/src/vm/fm7/fm7.h +++ b/source/src/vm/fm7/fm7.h @@ -19,6 +19,8 @@ #define USE_SPECIAL_RESET #define SUPPORT_DUMMY_DEVICE_LED 3 #define USE_MINIMUM_RENDERING 1 +#define USE_MOUSE +#define USE_JOYSTICK //#undef HAS_YM2608 //#define SUPPORT_YM2203_PORT @@ -374,8 +376,8 @@ protected: #if defined(HAS_DMA) HD6844 *dmac; #endif - DISPLAY* display; - KEYBOARD* keyboard; + DISPLAY* display; + KEYBOARD* keyboard; KANJIROM *kanjiclass1; #ifdef CAPABLE_KANJI_CLASS2 diff --git a/source/src/vm/gamegear/gamegear.h b/source/src/vm/gamegear/gamegear.h index da7a49974..408e8a06c 100644 --- a/source/src/vm/gamegear/gamegear.h +++ b/source/src/vm/gamegear/gamegear.h @@ -38,6 +38,7 @@ #define USE_AUTO_KEY_CAPS #define USE_ACCESS_LAMP #define USE_DEBUGGER +#define USE_JOUSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/gamegear/mastersystem.h b/source/src/vm/gamegear/mastersystem.h index 841c94ad4..cc51c5f6d 100644 --- a/source/src/vm/gamegear/mastersystem.h +++ b/source/src/vm/gamegear/mastersystem.h @@ -38,6 +38,7 @@ #define USE_AUTO_KEY_CAPS ///#define USE_ACCESS_LAMP #define USE_DEBUGGER +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/m5/m5.h b/source/src/vm/m5/m5.h index 87f8cfaa0..af1c81290 100644 --- a/source/src/vm/m5/m5.h +++ b/source/src/vm/m5/m5.h @@ -33,6 +33,7 @@ #define USE_AUTO_KEY_RELEASE 8 #define USE_DEBUGGER #define USE_STATE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/msx/msx.h b/source/src/vm/msx/msx.h index 1a197b2e0..cde01778b 100644 --- a/source/src/vm/msx/msx.h +++ b/source/src/vm/msx/msx.h @@ -67,6 +67,7 @@ #define USE_AUTO_KEY_RELEASE 10 #define USE_DEBUGGER #define USE_STATE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/mz2500/mz2500.h b/source/src/vm/mz2500/mz2500.h index f5e57b89f..25a2ffc49 100644 --- a/source/src/vm/mz2500/mz2500.h +++ b/source/src/vm/mz2500/mz2500.h @@ -51,6 +51,8 @@ #define USE_ACCESS_LAMP #define USE_DEBUGGER #define USE_STATE +#define USE_MOUSE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/mz2800/mz2800.h b/source/src/vm/mz2800/mz2800.h index 1eedd0caf..8f81f8295 100644 --- a/source/src/vm/mz2800/mz2800.h +++ b/source/src/vm/mz2800/mz2800.h @@ -40,6 +40,8 @@ #define USE_ACCESS_LAMP #define USE_DEBUGGER #define USE_STATE +#define USE_MOUSE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/mz5500/mz5500.h b/source/src/vm/mz5500/mz5500.h index 17bf3f761..eae9a251d 100644 --- a/source/src/vm/mz5500/mz5500.h +++ b/source/src/vm/mz5500/mz5500.h @@ -61,6 +61,8 @@ #define USE_ACCESS_LAMP #define USE_DEBUGGER #define USE_STATE +#define USE_MOUSE +//#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/mz700/mz700.h b/source/src/vm/mz700/mz700.h index 1203f3292..22b009ff2 100644 --- a/source/src/vm/mz700/mz700.h +++ b/source/src/vm/mz700/mz700.h @@ -79,6 +79,7 @@ #endif #define USE_DEBUGGER #define USE_STATE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/pc100/pc100.h b/source/src/vm/pc100/pc100.h index 6830d59a5..b7b0e2786 100644 --- a/source/src/vm/pc100/pc100.h +++ b/source/src/vm/pc100/pc100.h @@ -44,6 +44,7 @@ #define USE_ACCESS_LAMP #define USE_DEBUGGER #define USE_STATE +#define USE_MOUSE #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/pc6001/pc6001.h b/source/src/vm/pc6001/pc6001.h index 97728a012..585f08958 100644 --- a/source/src/vm/pc6001/pc6001.h +++ b/source/src/vm/pc6001/pc6001.h @@ -95,6 +95,8 @@ #define USE_PRINTER #define USE_DEBUGGER #define USE_STATE +#define USE_JOYSTICK +//#define USE_MOUSE #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/pc8801/pc8801.h b/source/src/vm/pc8801/pc8801.h index e8f21559b..6a9aead6e 100644 --- a/source/src/vm/pc8801/pc8801.h +++ b/source/src/vm/pc8801/pc8801.h @@ -108,6 +108,8 @@ #define USE_PRINTER #define USE_DEBUGGER #define USE_STATE +#define USE_MOUSE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/pc9801/pc9801.h b/source/src/vm/pc9801/pc9801.h index 678f4c5e5..0cc440573 100644 --- a/source/src/vm/pc9801/pc9801.h +++ b/source/src/vm/pc9801/pc9801.h @@ -151,6 +151,8 @@ #define USE_PRINTER #define USE_DEBUGGER #define USE_STATE +#define USE_MOUSE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/phc25/phc25.h b/source/src/vm/phc25/phc25.h index 72afcedac..0ecd984e8 100644 --- a/source/src/vm/phc25/phc25.h +++ b/source/src/vm/phc25/phc25.h @@ -40,6 +40,8 @@ #define USE_AUTO_KEY_CAPS #define USE_DEBUGGER #define USE_STATE +//#define USE_MOUSE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/pv1000/pv1000.h b/source/src/vm/pv1000/pv1000.h index ff7946cd1..08e7ed3f7 100644 --- a/source/src/vm/pv1000/pv1000.h +++ b/source/src/vm/pv1000/pv1000.h @@ -33,6 +33,8 @@ #define KEY_TO_JOY_BUTTON_4 0x53 #define USE_DEBUGGER #define USE_STATE +//#define USE_MOUSE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/pv2000/pv2000.h b/source/src/vm/pv2000/pv2000.h index 06aab639d..5957f60a0 100644 --- a/source/src/vm/pv2000/pv2000.h +++ b/source/src/vm/pv2000/pv2000.h @@ -35,6 +35,7 @@ #define USE_AUTO_KEY_CAPS #define USE_DEBUGGER #define USE_STATE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/pyuta/pyuta.h b/source/src/vm/pyuta/pyuta.h index fbe4518e4..82d7179bd 100644 --- a/source/src/vm/pyuta/pyuta.h +++ b/source/src/vm/pyuta/pyuta.h @@ -30,6 +30,7 @@ #define USE_AUTO_KEY_RELEASE 6 #define USE_AUTO_KEY_CAPS #define USE_STATE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/rx78/rx78.h b/source/src/vm/rx78/rx78.h index 7a06d4d9d..d56cf47a2 100644 --- a/source/src/vm/rx78/rx78.h +++ b/source/src/vm/rx78/rx78.h @@ -30,6 +30,7 @@ #define USE_AUTO_KEY_RELEASE 10 #define USE_AUTO_KEY_CAPS #define USE_DEBUGGER +#define USE_JOYSTICK #define USE_STATE #include "../../common.h" diff --git a/source/src/vm/sc3000/sc3000.h b/source/src/vm/sc3000/sc3000.h index 10ab93453..a82ead01f 100644 --- a/source/src/vm/sc3000/sc3000.h +++ b/source/src/vm/sc3000/sc3000.h @@ -34,6 +34,7 @@ #define USE_ACCESS_LAMP #define USE_DEBUGGER #define USE_STATE +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/scv/scv.h b/source/src/vm/scv/scv.h index cef288732..b7909ae5d 100644 --- a/source/src/vm/scv/scv.h +++ b/source/src/vm/scv/scv.h @@ -30,6 +30,7 @@ #define KEY_TO_JOY_BUTTON_1 0x5a #define KEY_TO_JOY_BUTTON_2 0x58 #define USE_DEBUGGER +#define USE_JOYSTICK #define USE_STATE #include "../../common.h" diff --git a/source/src/vm/smc777/smc777.h b/source/src/vm/smc777/smc777.h index 3c7640131..b830877fe 100644 --- a/source/src/vm/smc777/smc777.h +++ b/source/src/vm/smc777/smc777.h @@ -50,6 +50,8 @@ #define USE_ACCESS_LAMP #define USE_DEBUGGER #define USE_STATE +//#define USE_MOUSE +#define USE_JOYSTICK static const int vm_autokey_table_base[][2] = { // 0x100: shift diff --git a/source/src/vm/x1/x1.h b/source/src/vm/x1/x1.h index 3f7d30e67..1dde1da39 100644 --- a/source/src/vm/x1/x1.h +++ b/source/src/vm/x1/x1.h @@ -109,6 +109,9 @@ #define USE_PRINTER #define USE_DEBUGGER #define USE_STATE +#define USE_MOUSE +#define USE_KEYBOARD +#define USE_JOYSTICK #include "../../common.h" #include "../../fileio.h" diff --git a/source/src/vm/z80tvgame/z80tvgame.h b/source/src/vm/z80tvgame/z80tvgame.h index af8d682cf..f26d3a49b 100644 --- a/source/src/vm/z80tvgame/z80tvgame.h +++ b/source/src/vm/z80tvgame/z80tvgame.h @@ -33,6 +33,7 @@ #define USE_KEY_TO_JOY #define KEY_TO_JOY_BUTTON_1 0x5a #define KEY_TO_JOY_BUTTON_2 0x58 +#define USE_JOYSTICK #define USE_DEBUGGER #define USE_STATE -- 2.11.0