[Qt][CMAKE] Add VM: MZ80A/K/1200.

diff --git a/source/build-cmake/cmake/config_mz80.cmake b/source/build-cmake/cmake/config_mz80.cmake
index a3e6824..33f3089 100644 (file)
--- a/source/build-cmake/cmake/config_mz80.cmake
+++ b/source/build-cmake/cmake/config_mz80.cmake
@@ -7,16 +7,9 @@ cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
-set(LOCAL_LIBS
-                  qt_osd
-                  qt_mz80
-                  qt_gui
-                  vm_mz80
-                  vm_vm
-                  vm_fmgen
-                  common_common
-                   )
+set(VM_NAME mz80k)
+set(USE_FMGEN OFF)
+set(USE_DEBUGGER ON)
 
 set(VMFILES_BASE
                   z80.cpp
@@ -99,21 +92,4 @@ if(USE_CMT_SOUND)
 add_definitions(-DDATAREC_SOUND)
 endif()
 
-
-#include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/mz80k)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fmgen)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/machines/mz80k)
-
 include(config_commonsource)
-
-if(USE_SSE2)
-#  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fm7/vram/sse2)
-#  add_subdirectory(../../src/vm/fm7/vram/sse2 vm/fm7/vram/sse2)
-endif()
-
-
-if(USE_SSE2)
-# include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/scaler/sse2)
-endif()
-

diff --git a/source/build-cmake/mz1200/CMakeLists.txt b/source/build-cmake/mz1200/CMakeLists.txt
index 4cd822e..8aeeb4a 100644 (file)
--- a/source/build-cmake/mz1200/CMakeLists.txt
+++ b/source/build-cmake/mz1200/CMakeLists.txt
@@ -11,15 +11,7 @@ message("** Start of configure CommonSourceProject,MZ1200, Qt **")
 message("")
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
 project (emumz1200)
 
 set(BUILD_MZ1200 ON CACHE BOOL "Build EMU-MZ1200")
 include(config_mz80)
-
-add_subdirectory(../../src/vm/mz80k vm/mz80)
-add_subdirectory(../../src/vm/fmgen vm/fmgen)
-add_subdirectory(../../src/qt/machines/mz80k qt/mz80)
-
-     
-add_subdirectory(../../src/qt/common qt/common)

diff --git a/source/build-cmake/mz80a/CMakeLists.txt b/source/build-cmake/mz80a/CMakeLists.txt
index c5a2f58..c5fdf3c 100644 (file)
--- a/source/build-cmake/mz80a/CMakeLists.txt
+++ b/source/build-cmake/mz80a/CMakeLists.txt
@@ -16,10 +16,3 @@ project (emumz80a)
 
 set(BUILD_MZ80A ON CACHE BOOL "Build EMU-MZ80A")
 include(config_mz80)
-
-add_subdirectory(../../src/vm/mz80k vm/mz80)
-add_subdirectory(../../src/vm/fmgen vm/fmgen)
-add_subdirectory(../../src/qt/machines/mz80k qt/mz80)
-
-     
-add_subdirectory(../../src/qt/common qt/common)

diff --git a/source/build-cmake/mz80k/CMakeLists.txt b/source/build-cmake/mz80k/CMakeLists.txt
index 277dba0..220b543 100644 (file)
--- a/source/build-cmake/mz80k/CMakeLists.txt
+++ b/source/build-cmake/mz80k/CMakeLists.txt
@@ -17,9 +17,3 @@ project (emumz80k)
 set(BUILD_MZ80K ON CACHE BOOL "Build EMU-MZ80K")
 include(config_mz80)
 
-add_subdirectory(../../src/vm/mz80k vm/mz80)
-add_subdirectory(../../src/vm/fmgen vm/fmgen)
-add_subdirectory(../../src/qt/machines/mz80k qt/mz80)
-
-     
-add_subdirectory(../../src/qt/common qt/common)

diff --git a/source/src/qt/machines/mz80k/CMakeLists.txt b/source/src/qt/machines/mz80k/CMakeLists.txt
index 4d8ca60..ba1592a 100644 (file)
--- a/source/src/qt/machines/mz80k/CMakeLists.txt
+++ b/source/src/qt/machines/mz80k/CMakeLists.txt
@@ -8,7 +8,7 @@ if(USE_QT_5)
 else()
   QT4_WRAP_CPP(s_qt_mz80_headers_MOC ${s_qt_mz80_headers})
 endif()
-add_library(qt_mz80
+add_library(qt_mz80k
          MainWindow.cpp
          ${s_qt_mz80_headers_MOC}
 )

diff --git a/source/src/vm/mz80k/CMakeLists.txt b/source/src/vm/mz80k/CMakeLists.txt
index b664875..8c550b2 100644 (file)
--- a/source/src/vm/mz80k/CMakeLists.txt
+++ b/source/src/vm/mz80k/CMakeLists.txt
@@ -4,7 +4,7 @@ message("* vm/mz80K")
 
 if(BUILD_MZ80AIF)
 
-add_library(vm_mz80
+add_library(vm_mz80k
        memory.cpp
        display.cpp
        keyboard.cpp
@@ -13,7 +13,7 @@ add_library(vm_mz80
 )
 
 elseif(BUILD_MZ80FIO)
-add_library(vm_mz80
+add_library(vm_mz80k
        memory.cpp
        display.cpp
        keyboard.cpp
@@ -23,12 +23,10 @@ add_library(vm_mz80
 
 else()
 
-add_library(vm_mz80
+add_library(vm_mz80k
        memory.cpp
        display.cpp
        keyboard.cpp
        mz80k.cpp
 )
-
-
 endif()