[BUILD][CMAKE] Update some CMakeLists.txt .

diff --git a/source/build-cmake/babbage2nd/CMakeLists.txt b/source/build-cmake/babbage2nd/CMakeLists.txt
index 9482191..9599a06 100644 (file)
--- a/source/build-cmake/babbage2nd/CMakeLists.txt
+++ b/source/build-cmake/babbage2nd/CMakeLists.txt
@@ -10,10 +10,10 @@ message("")
 message("** Start of configure CommonSourceProject,Babbage2nd, Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
+project (emubabbage2nd)
 
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
 
-project (emubabbage2nd)
 set(EXEC_TARGET emubabbage2nd)
 set(VM_NAME babbage2nd)
 set(USE_FMGEN OFF)

diff --git a/source/build-cmake/bmjr/CMakeLists.txt b/source/build-cmake/bmjr/CMakeLists.txt
index c38b0e0..daf7ed8 100644 (file)
--- a/source/build-cmake/bmjr/CMakeLists.txt
+++ b/source/build-cmake/bmjr/CMakeLists.txt
@@ -10,10 +10,10 @@ message("")
 message("** Start of configure CommonSourceProject,Hitachi Basic Master Jr., Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
+project (emubmjr)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
 
 
-project (emubmjr)
 set(VM_NAME bmjr)
 set(EXEC_TARGET emubmjr)
 set(USE_FMGEN OFF)

diff --git a/source/build-cmake/cmake/config_emufm7.cmake b/source/build-cmake/cmake/config_emufm7.cmake
index 50fb83f..c2d18ee 100644 (file)
--- a/source/build-cmake/cmake/config_emufm7.cmake
+++ b/source/build-cmake/cmake/config_emufm7.cmake
@@ -97,7 +97,7 @@ endif()
 if(BUILD_FM7)
   set(EXEC_TARGET emufm7)
   add_definitions(-D_FM7)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm7.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm7.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} ay_3_891x.cpp)
   set(FLAG_USE_Z80 ON)
   add_definitions(-DBUILD_Z80)
@@ -105,7 +105,7 @@ if(BUILD_FM7)
 elseif(BUILD_FM8)
   set(EXEC_TARGET emufm8)
   add_definitions(-D_FM8)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm8.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm8.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} ay_3_891x.cpp)
   set(FLAG_USE_Z80 ON)
   add_definitions(-DBUILD_Z80)
@@ -113,7 +113,7 @@ elseif(BUILD_FM8)
 elseif(BUILD_FM77)
   set(EXEC_TARGET emufm77)
   add_definitions(-D_FM77)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm77.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm77.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} ay_3_891x.cpp)
   set(FLAG_USE_Z80 ON)
   add_definitions(-DBUILD_Z80)
@@ -121,7 +121,7 @@ elseif(BUILD_FM77)
 elseif(BUILD_FM77L2)
   set(EXEC_TARGET emufm77l2)
   add_definitions(-D_FM77L2)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm77l2.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm77l2.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} ay_3_891x.cpp)
   set(FLAG_USE_Z80 ON)
   add_definitions(-DBUILD_Z80)
@@ -129,8 +129,8 @@ elseif(BUILD_FM77L2)
 elseif(BUILD_FM77L4)
   set(EXEC_TARGET emufm77l4)
   add_definitions(-D_FM77L4)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/source/src/qt/fm7/fm77.qrc)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm77l4.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/source/src/qt/fm7/fm77.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm77l4.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} ay_3_891x.cpp)
   set(FLAG_USE_Z80 ON)
   add_definitions(-DBUILD_Z80)
@@ -139,42 +139,42 @@ elseif(BUILD_FM77AV)
   set(EXEC_TARGET emufm77av)
   add_definitions(-D_FM77AV)
   set(FM77AV_VARIANTS ON)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm77av.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm77av.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} beep.cpp)
 
 elseif(BUILD_FM77AV20)
   set(EXEC_TARGET emufm77av20)
   add_definitions(-D_FM77AV20)
   set(FM77AV_VARIANTS ON)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm77av20.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm77av20.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} beep.cpp)
   
 elseif(BUILD_FM77AV20EX)
   set(EXEC_TARGET emufm77av20ex)
   add_definitions(-D_FM77AV20EX)
   set(FM77AV_VARIANTS ON)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm77av20ex.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm77av20ex.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} beep.cpp)
   
 elseif(BUILD_FM77AV40)
   set(EXEC_TARGET emufm77av40)
   add_definitions(-D_FM77AV40)
   set(FM77AV_VARIANTS ON)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm77av40.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm77av40.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} beep.cpp)
 
 elseif(BUILD_FM77AV40SX)
   set(EXEC_TARGET emufm77av40sx)
   add_definitions(-D_FM77AV40SX)
   set(FM77AV_VARIANTS ON)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm77av40sx.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm77av40sx.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} beep.cpp)
 
 elseif(BUILD_FM77AV40EX)
   set(EXEC_TARGET emufm77av40ex)
   add_definitions(-D_FM77AV40EX)
   set(FM77AV_VARIANTS ON)
-  set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm77av40ex.qrc)
+  set(RESOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common/qrc/fm77av40ex.qrc)
   set(VMFILES_LIB ${VMFILES_LIB} beep.cpp)
   
 endif()

diff --git a/source/build-cmake/colecovision/CMakeLists.txt b/source/build-cmake/colecovision/CMakeLists.txt
index 53d96bf..fb04166 100644 (file)
--- a/source/build-cmake/colecovision/CMakeLists.txt
+++ b/source/build-cmake/colecovision/CMakeLists.txt
@@ -10,9 +10,11 @@ message("")
 message("** Start of configure CommonSourceProject,COLECO Vision, Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
 
 project (colecovision)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+
+
 set(VM_NAME colecovision)
 set(USE_FMGEN OFF)
 set(WITH_JOYSTICK ON)

diff --git a/source/build-cmake/ex80/CMakeLists.txt b/source/build-cmake/ex80/CMakeLists.txt
index 0c4311f..1eec51a 100644 (file)
--- a/source/build-cmake/ex80/CMakeLists.txt
+++ b/source/build-cmake/ex80/CMakeLists.txt
@@ -10,10 +10,10 @@ message("")
 message("** Start of configure CommonSourceProject,EX80, Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
+project (emuex80)
 
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
 
-project (emuex80)
 set(EXEC_TARGET emuex80)
 set(VM_NAME ex80)
 set(USE_FMGEN OFF)

diff --git a/source/build-cmake/familybasic/CMakeLists.txt b/source/build-cmake/familybasic/CMakeLists.txt
index 474956d..369199b 100644 (file)
--- a/source/build-cmake/familybasic/CMakeLists.txt
+++ b/source/build-cmake/familybasic/CMakeLists.txt
@@ -10,11 +10,10 @@ message("")
 message("** Start of configure CommonSourceProject,EPSON HC 80, Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
-
 project (emufamilybasic)
 
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+
 set(EXEC_TARGET emufamilybasic)
 set(VM_NAME familybasic)
 set(USE_FMGEN OFF)

diff --git a/source/build-cmake/fm16pi/CMakeLists.txt b/source/build-cmake/fm16pi/CMakeLists.txt
index 89f6a7c..344c8cd 100644 (file)
--- a/source/build-cmake/fm16pi/CMakeLists.txt
+++ b/source/build-cmake/fm16pi/CMakeLists.txt
@@ -10,10 +10,12 @@ message("")
 message("** Start of configure CommonSourceProject,FM16π, Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
 
 
 project (emufm16pi)
+set(CMAKE_MODULE_PATH "${emufm16pi_SOURCE_DIR}/../cmake")
+
+
 set(EXEC_TARGET emufm16pi)
 set(VM_NAME fm16pi)
 set(USE_FMGEN OFF)

diff --git a/source/build-cmake/fm7/CMakeLists.txt b/source/build-cmake/fm7/CMakeLists.txt
index f7bb391..876f737 100644 (file)
--- a/source/build-cmake/fm7/CMakeLists.txt
+++ b/source/build-cmake/fm7/CMakeLists.txt
@@ -6,9 +6,9 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
 
 project (emufm7)
+set(CMAKE_MODULE_PATH "${emufm7_SOURCE_DIR}/../cmake")
 
 set(BUILD_FM7 ON CACHE BOOL "Build for FM7")
 

diff --git a/source/build-cmake/fm77/CMakeLists.txt b/source/build-cmake/fm77/CMakeLists.txt
index 821de46..22d13a1 100644 (file)
--- a/source/build-cmake/fm77/CMakeLists.txt
+++ b/source/build-cmake/fm77/CMakeLists.txt
@@ -6,11 +6,8 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
 project (emufm77)
-
-
+set(CMAKE_MODULE_PATH "${emufm77_SOURCE_DIR}/../cmake")
 set(BUILD_FM77 ON CACHE BOOL "Build for FM77")
 
 include(config_emufm7)

diff --git a/source/build-cmake/fm77av/CMakeLists.txt b/source/build-cmake/fm77av/CMakeLists.txt
index c8ff029..48431d3 100644 (file)
--- a/source/build-cmake/fm77av/CMakeLists.txt
+++ b/source/build-cmake/fm77av/CMakeLists.txt
@@ -11,6 +11,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
 
 project (emufm77av)
 
+set(CMAKE_MODULE_PATH "${emufm77av_SOURCE_DIR}/../cmake")
 set(BUILD_FM77AV ON CACHE BOOL "Build for FM77AV")
 
 include(config_emufm7)

diff --git a/source/build-cmake/fm77av40/CMakeLists.txt b/source/build-cmake/fm77av40/CMakeLists.txt
index f5581b6..07ada42 100644 (file)
--- a/source/build-cmake/fm77av40/CMakeLists.txt
+++ b/source/build-cmake/fm77av40/CMakeLists.txt
@@ -6,11 +6,10 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
-project (emufm77av)
+project (emufm77av40)
 
 
+set(CMAKE_MODULE_PATH "${emufm77av40_SOURCE_DIR}/../cmake")
 set(BUILD_FM77AV40 ON CACHE BOOL "Build for FM77AV40")
 
 include(config_emufm7)

diff --git a/source/build-cmake/fm77av40ex/CMakeLists.txt b/source/build-cmake/fm77av40ex/CMakeLists.txt
index ba71a95..d958520 100644 (file)
--- a/source/build-cmake/fm77av40ex/CMakeLists.txt
+++ b/source/build-cmake/fm77av40ex/CMakeLists.txt
@@ -6,10 +6,10 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
 
 project (emufm77av40ex)
 
+set(CMAKE_MODULE_PATH "${emufm77av40ex_SOURCE_DIR}/../cmake")
 set(BUILD_FM77AV40EX ON CACHE BOOL "Build for FM77AV40EX")
 
 include(config_emufm7)

diff --git a/source/build-cmake/fmr250/CMakeLists.txt b/source/build-cmake/fmr250/CMakeLists.txt
index 1d31764..8a99eee 100644 (file)
--- a/source/build-cmake/fmr250/CMakeLists.txt
+++ b/source/build-cmake/fmr250/CMakeLists.txt
@@ -10,11 +10,10 @@ message("")
 message("** Start of configure CommonSourceProject,FMR250, Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
-
 project (emufmr250)
 
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+
 set(BUILD_FMR250 ON CACHE BOOL "Build for FM-R250")
 
 include(config_emufmr50)

diff --git a/source/build-cmake/fmr280/CMakeLists.txt b/source/build-cmake/fmr280/CMakeLists.txt
index 8c1e4d5..0b8179e 100644 (file)
--- a/source/build-cmake/fmr280/CMakeLists.txt
+++ b/source/build-cmake/fmr280/CMakeLists.txt
@@ -10,11 +10,10 @@ message("")
 message("** Start of configure CommonSourceProject,FMR280, Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
-
 project (emufmr280)
 
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+
 set(BUILD_FMR280 ON CACHE BOOL "Build for FM-R280")
 
 include(config_emufmr50)

diff --git a/source/build-cmake/fmr30_i286/CMakeLists.txt b/source/build-cmake/fmr30_i286/CMakeLists.txt
index 3e1f0a8..f8a7099 100644 (file)
--- a/source/build-cmake/fmr30_i286/CMakeLists.txt
+++ b/source/build-cmake/fmr30_i286/CMakeLists.txt
@@ -10,9 +10,11 @@ message("")
 message("** Start of configure CommonSourceProject,FMR 30, Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
+project (emufmr30_i286)
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+
 
-project (emufmr30)
 set(VM_NAME fmr30)
 set(USE_FMGEN OFF)
 set(VMFILES

diff --git a/source/build-cmake/fmr30_i86/CMakeLists.txt b/source/build-cmake/fmr30_i86/CMakeLists.txt
index ef6b7dc..463fd6f 100644 (file)
--- a/source/build-cmake/fmr30_i86/CMakeLists.txt
+++ b/source/build-cmake/fmr30_i86/CMakeLists.txt
@@ -10,9 +10,11 @@ message("")
 message("** Start of configure CommonSourceProject,FMR 30, Qt **")
 message("")
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
 
-project (emufmr30)
+project (emufmr30_i86)
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
+
 set(VM_NAME fmr30)
 set(USE_FMGEN OFF)
 set(VMFILES

diff --git a/source/build-cmake/libCSPavio/CMakeLists.txt b/source/build-cmake/libCSPavio/CMakeLists.txt
index 54af6bd..5e64b7b 100644 (file)
--- a/source/build-cmake/libCSPavio/CMakeLists.txt
+++ b/source/build-cmake/libCSPavio/CMakeLists.txt
@@ -6,9 +6,9 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
 project (libCSPavio)
+set(CMAKE_MODULE_PATH "${libCSPavio_SOURCE_DIR}/../cmake")
+
 #include(config_commonsource)
 
 include(config_sharedlibs)

diff --git a/source/build-cmake/libCSPcommon_vm/CMakeLists.txt b/source/build-cmake/libCSPcommon_vm/CMakeLists.txt
index fa87a71..1618435 100644 (file)
--- a/source/build-cmake/libCSPcommon_vm/CMakeLists.txt
+++ b/source/build-cmake/libCSPcommon_vm/CMakeLists.txt
@@ -6,10 +6,9 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
 
 project (libCSPcommon_vm)
-#include(config_commonsource)
+set(CMAKE_MODULE_PATH "${libCSPcommon_vm_SOURCE_DIR}/../cmake")
 
 include(config_sharedlibs)
 

diff --git a/source/build-cmake/libCSPemu_utils/CMakeLists.txt b/source/build-cmake/libCSPemu_utils/CMakeLists.txt
index da5f95e..4134e80 100644 (file)
--- a/source/build-cmake/libCSPemu_utils/CMakeLists.txt
+++ b/source/build-cmake/libCSPemu_utils/CMakeLists.txt
@@ -6,9 +6,9 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
 project (libCSPemu_utils)
+set(CMAKE_MODULE_PATH "${libCSPemu_utils_SOURCE_DIR}/../cmake")
+
 
 include(config_sharedlibs)
 

diff --git a/source/build-cmake/libCSPfmgen/CMakeLists.txt b/source/build-cmake/libCSPfmgen/CMakeLists.txt
index a2c6fa5..828c201 100644 (file)
--- a/source/build-cmake/libCSPfmgen/CMakeLists.txt
+++ b/source/build-cmake/libCSPfmgen/CMakeLists.txt
@@ -6,11 +6,9 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
 project (libCSPfmgen)
-#include(config_commonsource)
 
+set(CMAKE_MODULE_PATH "${libCSPfmgen_SOURCE_DIR}/../cmake")
 include(config_sharedlibs)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm)

diff --git a/source/build-cmake/libCSPgui/CMakeLists.txt b/source/build-cmake/libCSPgui/CMakeLists.txt
index 2510064..75e86ac 100644 (file)
--- a/source/build-cmake/libCSPgui/CMakeLists.txt
+++ b/source/build-cmake/libCSPgui/CMakeLists.txt
@@ -6,10 +6,9 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
 project (libCSPgui)
 
+set(CMAKE_MODULE_PATH "${libCSPgui_SOURCE_DIR}/../cmake")
 include(config_sharedlibs)
 
 add_subdirectory(../../src/qt/gui qt/gui)

diff --git a/source/build-cmake/libCSPosd/CMakeLists.txt b/source/build-cmake/libCSPosd/CMakeLists.txt
index 9cee8ad..19088e6 100644 (file)
--- a/source/build-cmake/libCSPosd/CMakeLists.txt
+++ b/source/build-cmake/libCSPosd/CMakeLists.txt
@@ -6,10 +6,9 @@
 cmake_minimum_required (VERSION 2.8)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../cmake")
-
 project (libCSPgui)
 
+set(CMAKE_MODULE_PATH "${libCSPgui_SOURCE_DIR}/../cmake")
 include(config_sharedlibs)
 
 add_subdirectory(../../src/qt qt/osd)

diff --git a/source/src/qt/common/CMakeLists.txt b/source/src/qt/common/CMakeLists.txt
index 9994c5b..cd7d494 100644 (file)
--- a/source/src/qt/common/CMakeLists.txt
+++ b/source/src/qt/common/CMakeLists.txt
@@ -28,10 +28,13 @@ set(QT_COMMON_BASE
          ../osd_wrapper.cpp
 )
 
-
  QT5_ADD_RESOURCES(s_qt_common_RCC ${RESOURCE}
-                     ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/i18n_global.qrc
-                     ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/icons.qrc)
+                     ${CMAKE_CURRENT_SOURCE_DIR}/qrc/i18n_global.qrc
+                     ${CMAKE_CURRENT_SOURCE_DIR}/qrc/icons.qrc)
+
+# QT5_ADD_RESOURCES(s_qt_common_RCC ${RESOURCE}
+#                    ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/i18n_global.qrc
+#                    ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/icons.qrc)
 #include(cotire)
 
 add_executable(${EXEC_TARGET}

diff --git a/source/src/qt/gui/CMakeLists.txt b/source/src/qt/gui/CMakeLists.txt
index 48b301f..299009b 100644 (file)
--- a/source/src/qt/gui/CMakeLists.txt
+++ b/source/src/qt/gui/CMakeLists.txt
@@ -113,35 +113,26 @@ set(s_qt_gui_srcs
 
 if(USE_QT_5)
   QT5_WRAP_CPP(s_qt_gui_headers_MOC ${s_qt_gui_headers})
-#  if(WIN32)
-    QT5_ADD_RESOURCES(s_qt_gui_RCC ${RESOURCE}
-                      ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/commontexts.qrc
-                     ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/shaders.qrc
-                     )
-#  else()
 #    QT5_ADD_RESOURCES(s_qt_gui_RCC ${RESOURCE}
 #                      ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/commontexts.qrc
 #                    ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/shaders.qrc
-#                    ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/i18n_global.qrc
 #                    )
-#  endif()
+    QT5_ADD_RESOURCES(s_qt_gui_RCC ${RESOURCE}
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../common/qrc/commontexts.qrc
+                     ${CMAKE_CURRENT_SOURCE_DIR}/../common/qrc/shaders.qrc
+                     )
 else()
   QT4_WRAP_CPP(s_qt_gui_headers_MOC ${s_qt_gui_headers})
 endif()
 
 if(WIN32)
-#add_library(qt_gui
-#        ${s_qt_gui_srcs}
-#        ${s_qt_gui_headers_MOC}
-#        ${s_qt_gui_RCC}
-#)
 include (GenerateExportHeader)
 add_library(CSPgui SHARED
          ${s_qt_gui_srcs}
          ${s_qt_gui_headers_MOC}
          ${s_qt_gui_RCC}
          )
-#QT5_USE_MODULES(CSPgui Widgets Core Gui OpenGL)
+
 target_link_libraries(CSPgui 
          ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libCSPosd.dll.a
          ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-cmake/bin-win32/libqt_avio.a

diff --git a/source/src/vm/fm7/fm7.cpp b/source/src/vm/fm7/fm7.cpp
index df4fe93..bf51b9f 100644 (file)
--- a/source/src/vm/fm7/fm7.cpp
+++ b/source/src/vm/fm7/fm7.cpp
@@ -666,8 +666,8 @@ void VM::connect_bus(void)
 #else
                                fdc->set_drive_type(i, DRIVE_TYPE_2D);
 #endif
-                               //fdc->set_drive_rpm(i, 360); // For FLEX.
                                fdc->set_drive_mfm(i, true);
+                               fdc->set_drive_rpm(i, 300);
                        }
                }
 #if defined(_FM8) || (_FM7) || (_FMNEW7)
@@ -679,8 +679,8 @@ void VM::connect_bus(void)
 // ToDo: Implement another FDC for 1MB (2HD or 8''), this is used by FM-8 to FM-77? Not FM77AV or later? I still know this.
                for(int i = 0; i < 2; i++) {
                        fdc_2HD->set_drive_type(i, DRIVE_TYPE_2HD);
-                       fdc_2HD->set_drive_rpm(i, 360);
                        fdc_2HD->set_drive_mfm(i, true);
+                       fdc_2HD->set_drive_rpm(i, 360);
                }
        }
 #endif