From c398f7ba373a414ccc172226222bf737b0f62a7d Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Tue, 22 Dec 2015 15:50:18 +0900 Subject: [PATCH] [VM][Qt][CMAKE] Add YS6464A and Z80 TVGAME. --- source/build-cmake/ys6464a/CMakeLists.txt | 25 +-------- source/build-cmake/z80tvgame_i8255/CMakeLists.txt | 61 ++-------------------- source/build-cmake/z80tvgame_z80pio/CMakeLists.txt | 60 +-------------------- 3 files changed, 7 insertions(+), 139 deletions(-) diff --git a/source/build-cmake/ys6464a/CMakeLists.txt b/source/build-cmake/ys6464a/CMakeLists.txt index 959b006e7..852580a9e 100644 --- a/source/build-cmake/ys6464a/CMakeLists.txt +++ b/source/build-cmake/ys6464a/CMakeLists.txt @@ -16,15 +16,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") project (emuys6464a) set(EXEC_TARGET emuys6464a) - -set(LOCAL_LIBS qt_osd - qt_ys6464a - qt_gui - vm_ys6464a - vm_vm - common_common - ) - +set(VM_NAME ys6464a) +set(USE_FMGEN OFF) set(VMFILES_BASE z80.cpp i8255.cpp @@ -42,8 +35,6 @@ set(WITH_DEBUGGER OFF CACHE BOOL "Build with debugger.") include(detect_target_cpu) -#include(windows-mingw-cross) -# set entry set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.") set(VMFILES ${VMFILES_BASE}) @@ -52,16 +43,4 @@ add_definitions(-D_YS6464A) add_definitions(-DWITHOUT_SOUND) set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/ys6464a.qrc) - -#include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/ys6464a) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/machines/ys6464a) - include(config_commonsource) - -add_subdirectory(../../src/vm/ys6464a vm/ys6464a) -add_subdirectory(../../src/qt/machines/ys6464a qt/ys6464a) - -add_subdirectory(../../src/qt/common qt/common) diff --git a/source/build-cmake/z80tvgame_i8255/CMakeLists.txt b/source/build-cmake/z80tvgame_i8255/CMakeLists.txt index c37136c1f..a98434a52 100644 --- a/source/build-cmake/z80tvgame_i8255/CMakeLists.txt +++ b/source/build-cmake/z80tvgame_i8255/CMakeLists.txt @@ -7,69 +7,14 @@ cmake_minimum_required (VERSION 2.8) cmake_policy(SET CMP0011 NEW) message("") -message("** Start of configure CommonSourceProject,Z80 TV Game, Qt **") +message("** Start of configure CommonSourceProject,Z80 TV Game i8255 version, Qt **") message("") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") -project (emuz80tvgame_z80pio) - - -set(LOCAL_LIBS qt_osd - qt_z80tvgame - qt_debugger - qt_gui - vm_z80tvgame - vm_vm - common_common - ) - -set(VMFILES_BASE - z80.cpp - pcm1bit.cpp - - event.cpp -) - +project (emuz80tvgame_i8255) set(BUILD_I8255 ON CACHE BOOL "Build I8255 version") -set(BUILD_Z80PIO OFF CACHE BOOL "Build Z80 PIO version") -set(USE_OPENMP ON CACHE BOOL "Build using OpenMP") -set(USE_OPENGL ON CACHE BOOL "Build using OpenGL") -set(WITH_DEBUGGER OFF CACHE BOOL "Build with debugger.") - -add_definitions(-D_Z80TVGAME) -if(BUILD_I8255) - set(EXEC_TARGET emuz80tvgame_i8255) - set(VMFILES ${VMFILES_BASE} i8255.cpp) - add_definitions(-D_USE_I8255) - set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/z80tvgame_i8255.qrc) -else() - set(EXEC_TARGET emuz80tvgame_z80pio) - set(VMFILES ${VMFILES_BASE} z80pio.cpp) - add_definitions(-D_USE_Z80PIO) - set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/z80tvgame_z80pio.qrc) -endif() - - -include(detect_target_cpu) -#include(windows-mingw-cross) -# set entry -set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.") - -#include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/z80tvgame) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/machines/z80tvgame) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/debugger) - -include(config_commonsource) - -add_subdirectory(../../src/vm/z80tvgame vm/z80tvgame) -add_subdirectory(../../src/qt/machines/z80tvgame qt/z80tvgame) -add_subdirectory(../../src/qt/debugger qt/debugger) - -add_subdirectory(../../src/qt/common qt/common) +include(config_z80tvgame) diff --git a/source/build-cmake/z80tvgame_z80pio/CMakeLists.txt b/source/build-cmake/z80tvgame_z80pio/CMakeLists.txt index f41af1b28..b294e3df4 100644 --- a/source/build-cmake/z80tvgame_z80pio/CMakeLists.txt +++ b/source/build-cmake/z80tvgame_z80pio/CMakeLists.txt @@ -7,66 +7,10 @@ cmake_minimum_required (VERSION 2.8) cmake_policy(SET CMP0011 NEW) message("") -message("** Start of configure CommonSourceProject,Z80 TV Game, Qt **") +message("** Start of configure CommonSourceProject,Z80 TV Game Z80PIO version, Qt **") message("") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake") - - -project (emuz80tvgame_z80pio) - -set(EXEC_TARGET emuz80tvgame_z80pio) - -set(LOCAL_LIBS qt_osd - qt_z80tvgame - qt_gui - qt_debugger - vm_z80tvgame - vm_vm - common_common - ) - -set(VMFILES_BASE - z80.cpp - pcm1bit.cpp - - event.cpp -) - - -set(BUILD_I8255 OFF CACHE BOOL "Build I8255 version") set(BUILD_Z80PIO ON CACHE BOOL "Build Z80 PIO version") -set(USE_OPENMP ON CACHE BOOL "Build using OpenMP") -set(USE_OPENGL ON CACHE BOOL "Build using OpenGL") -set(WITH_DEBUGGER OFF CACHE BOOL "Build with debugger.") - -add_definitions(-D_Z80TVGAME) -if(BUILD_I8255) - set(VMFILES ${VMFILES_BASE} i8255.cpp) - add_definitions(-D_USE_I8255) - set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/z80tvgame_i8255.qrc) -else() - set(VMFILES ${VMFILES_BASE} z80pio.cpp) - add_definitions(-D_USE_Z80PIO) - set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/z80tvgame_z80pio.qrc) -endif() - -include(detect_target_cpu) -# set entry -set(CMAKE_SYSTEM_PROCESSOR ${ARCHITECTURE} CACHE STRING "Set processor to build.") - -#include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/z80tvgame) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/machines/z80tvgame) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/debugger) - -include(config_commonsource) - -add_subdirectory(../../src/vm/z80tvgame vm/z80tvgame) -add_subdirectory(../../src/qt/machines/z80tvgame qt/z80tvgame) -add_subdirectory(../../src/qt/debugger qt/debugger) - -add_subdirectory(../../src/qt/common qt/common) +include(config_z80tvgame) -- 2.11.0