• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revision6569701bc9b97d96fa6e49d3b08447bdb4d3ac66 (tree)
Time2018-03-26 02:23:02
AuthorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[CMake][FM16BETA] Fix FTBFS.

Change Summary

Incremental Difference

--- a/source/build-cmake/cmake/config_emufm16beta.cmake
+++ b/source/build-cmake/cmake/config_emufm16beta.cmake
@@ -12,12 +12,13 @@ set(WITH_JOYSTICK OFF)
1212 set(WITH_MOUSE ON)
1313
1414 set(VMFILES
15+ i8237.cpp
1516 msm58321.cpp
1617 # scsi_dev.cpp
1718 # scsi_host.cpp
1819 # scsi_hdd.cpp
1920 memory.cpp
20-
21+
2122 event.cpp
2223 io.cpp
2324 )
@@ -25,7 +26,7 @@ set(VMFILES
2526 set(VMFILES_LIB
2627 hd46505.cpp
2728
28- i8237.cpp
29+ i8237_base.cpp
2930 i8251.cpp
3031 i8259.cpp
3132 msm58321_base.cpp
@@ -66,13 +67,13 @@ if(BUILD_FM16BETA_286)
6667 set(FLAG_USE_I286 ON)
6768 elseif(BUILD_FM16BETA_86)
6869 set(EXEC_TARGET emufm16beta_86)
69- add_definitions(-D_FMR50)
70+ add_definitions(-D_FM16BETA)
7071 add_definitions(-DHAS_I86)
7172 set(FLAG_USE_I386_VARIANTS OFF)
7273 set(FLAG_USE_I286 ON)
7374 set(RESOURCE ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/fm16beta.qrc)
7475 endif()
7576
76-include(config_commonsource)
77+#include(config_commonsource)
7778
7879
--- a/source/src/qt/machines/fm16beta/CMakeLists.txt
+++ b/source/src/qt/machines/fm16beta/CMakeLists.txt
@@ -1,6 +1,6 @@
11 message("* qt/fm16beta")
22
3-set(s_qt_fm16pi_headers
3+set(s_qt_fm16beta_headers
44 menuclasses.h
55 )
66
Show on old repository browser