From 20db0726a625989beb3576561b03e8295c1928cf Mon Sep 17 00:00:00 2001
From: "K.Ohta" <whatisthis.sowhat@gmail.com>
Date: Tue, 22 Dec 2015 00:11:26 +0900
Subject: [PATCH] [BUILD][CMAKE][Qt] Add MZ-700/800/1500. [VM][CMAKE][MZ1500]
 Remove dependency of FMGEN.

---
 source/build-cmake/cmake/config_mz700.cmake | 21 ++++-----------------
 source/build-cmake/mz1500/CMakeLists.txt    |  9 ---------
 source/build-cmake/mz700/CMakeLists.txt     |  6 ------
 source/build-cmake/mz800/CMakeLists.txt     |  7 -------
 4 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/source/build-cmake/cmake/config_mz700.cmake b/source/build-cmake/cmake/config_mz700.cmake
index 2d781d896..159a05e4a 100644
--- a/source/build-cmake/cmake/config_mz700.cmake
+++ b/source/build-cmake/cmake/config_mz700.cmake
@@ -5,15 +5,7 @@
 
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
-
-set(LOCAL_LIBS	   qt_osd
-		   qt_mz700
-		   qt_gui
-		   vm_mz700
-		   vm_vm
-		   vm_fmgen
-		   common_common
-                   )
+set(VM_NAME mz700)
 
 set(VMFILES_BASE
 		   z80.cpp
@@ -69,32 +61,27 @@ set(VMFILES ${VMFILES_MZ1500})
 add_definitions(-D_MZ1500)
 set(EXEC_TARGET emumz1500)
 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/mz1500.qrc)
-
+set(USE_FMGEN OFF)
 elseif(BUILD_MZ800)
 
 set(VMFILES ${VMFILES_MZ800})
 add_definitions(-D_MZ800)
 set(EXEC_TARGET emumz800)
 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/mz800.qrc)
+set(USE_FMGEN OFF)
 else()
 
 set(VMFILES ${VMFILES_BASE})
 add_definitions(-D_MZ700)
 set(EXEC_TARGET emumz700)
 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/mz700.qrc)
+set(USE_FMGEN OFF)
 endif()
 
 if(USE_CMT_SOUND)
 add_definitions(-DDATAREC_SOUND)
 endif()
 
-
-#include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/mz700)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fmgen)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/machines/mz700)
-
 include(config_commonsource)
 
 
diff --git a/source/build-cmake/mz1500/CMakeLists.txt b/source/build-cmake/mz1500/CMakeLists.txt
index 00bd0ddb7..81faa3298 100644
--- a/source/build-cmake/mz1500/CMakeLists.txt
+++ b/source/build-cmake/mz1500/CMakeLists.txt
@@ -11,17 +11,8 @@ message("** Start of configure CommonSourceProject,MZ-1500, Qt **")
 message("")
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
-
 project (emumz1500)
 
 set(BUILD_MZ1500 ON CACHE BOOL "Build EMU-MZ1500")
 
 include(config_mz700)
-
-add_subdirectory(../../src/vm/mz700 vm/mz700)
-add_subdirectory(../../src/vm/fmgen vm/fmgen)
-add_subdirectory(../../src/qt/machines/mz700 qt/mz700)
-
-     
-add_subdirectory(../../src/qt/common qt/common)
diff --git a/source/build-cmake/mz700/CMakeLists.txt b/source/build-cmake/mz700/CMakeLists.txt
index 51060a95b..913c40a98 100644
--- a/source/build-cmake/mz700/CMakeLists.txt
+++ b/source/build-cmake/mz700/CMakeLists.txt
@@ -18,9 +18,3 @@ project (emumz700)
 set(BUILD_MZ700 ON CACHE BOOL "Build EMU-MZ700")
 
 include(config_mz700)
-
-add_subdirectory(../../src/vm/mz700 vm/mz700)
-add_subdirectory(../../src/vm/fmgen vm/fmgen)
-add_subdirectory(../../src/qt/machines/mz700 qt/mz700)
-     
-add_subdirectory(../../src/qt/common qt/common)
diff --git a/source/build-cmake/mz800/CMakeLists.txt b/source/build-cmake/mz800/CMakeLists.txt
index 80527dc14..1d8b7b1d7 100644
--- a/source/build-cmake/mz800/CMakeLists.txt
+++ b/source/build-cmake/mz800/CMakeLists.txt
@@ -18,10 +18,3 @@ project (emumz800)
 set(BUILD_MZ800 ON CACHE BOOL "Build EMU-MZ800")
 
 include(config_mz700)
-
-add_subdirectory(../../src/vm/mz700 vm/mz700)
-add_subdirectory(../../src/vm/fmgen vm/fmgen)
-add_subdirectory(../../src/qt/machines/mz700 qt/mz700)
-
-     
-add_subdirectory(../../src/qt/common qt/common)
-- 
2.11.0