• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: 提交

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


Commit MetaInfo

修订版03d6e92d37c5bff7aac37aac92ba95766a189097 (tree)
时间2020-02-20 05:01:51
作者Kyuma Ohta <whatisthis.sowhat@gmai...>
CommiterKyuma Ohta

Log Message

[VM][FMTOWNS][FMGEN] Fix LACKing DLLEXPORT attribute to OPN2:: class.
[VM][FMTOWNS] Fix FTBFS with LLVM CLANG.
[BUILD][CMAKE][Windows][LLVM] Update Qt version to 5.14.

更改概述

差异

--- a/source/build-cmake/cmake/config_commonsource.cmake
+++ b/source/build-cmake/cmake/config_commonsource.cmake
@@ -232,13 +232,14 @@ endif()
232232
233233 if(DEFINED VM_NAME)
234234 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/${VM_NAME})
235-# if(USE_FMGEN)
235+
236236 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fmgen)
237-# if(WIN32)
238-# set(FMGEN_LIB vm_fmgen)
239-# set(FMGEN_LIB "-lCSPfmgen")
240-# endif()
241-# endif()
237+# if(USE_FMGEN)
238+# if(WIN32)
239+# set(FMGEN_LIB vm_fmgen)
240+# set(FMGEN_LIB "-lCSPfmgen")
241+# endif()
242+# endif()
242243 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/machines/${VM_NAME})
243244 endif()
244245
--- a/source/build-cmake/cmake/toolchain_win32_cross_linux_llvm.cmake
+++ b/source/build-cmake/cmake/toolchain_win32_cross_linux_llvm.cmake
@@ -57,13 +57,13 @@ if(USE_SDL2)
5757 SET(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} /usr/i686-w64-mingw32
5858 /usr/local/i586-mingw-msvc
5959 /usr/local/i586-mingw-msvc/SDL/i686-w64-mingw32
60- /usr/local/i586-mingw-msvc/5.12/mingw_82x
60+ /usr/local/i586-mingw-msvc/5.14/mingw_82x
6161 )
6262 else()
6363 SET(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} /usr/i686-w64-mingw32
6464 /usr/local/i586-mingw-msvc
6565 /usr/local/i586-mingw-msvc/SDL1/
66- /usr/local/i586-mingw-msvc/5.12/mingw_82x
66+ /usr/local/i586-mingw-msvc/5.14/mingw_82x
6767 )
6868 endif()
6969
--- a/source/src/vm/common_vm/CMakeLists.txt
+++ b/source/src/vm/common_vm/CMakeLists.txt
@@ -1,6 +1,6 @@
11 message("* vm/common_vm")
22
3-SET(THIS_LIB_VERSION 2.23.0)
3+SET(THIS_LIB_VERSION 2.23.1)
44
55 #include(cotire)
66 set(s_vm_common_vm_srcs
@@ -109,6 +109,7 @@ set(s_vm_common_vm_srcs
109109 ../fm7/hd6844.cpp
110110 ../fm7/mb61vh010.cpp
111111 # ../fm7/dummydevice.cpp
112+# ../fmtowns/ym2612.cpp
112113
113114 ../i386_np21.cpp
114115 ../np21/i386c/cpucore.cpp
--- a/source/src/vm/fmgen/CMakeLists.txt
+++ b/source/src/vm/fmgen/CMakeLists.txt
@@ -1,7 +1,7 @@
11 cmake_minimum_required (VERSION 2.6)
22
33 message("* vm/fmgen")
4-SET(THIS_LIB_VERSION 1.6.0)
4+SET(THIS_LIB_VERSION 1.6.1)
55 add_definitions(-D__LIBFMGEN_VERSION=\"libCSPfmgen.${THIS_LIB_VERSION}\")
66
77 SET(s_vm_fmgen_srcs
--- a/source/src/vm/fmgen/opna.h
+++ b/source/src/vm/fmgen/opna.h
@@ -455,7 +455,7 @@ namespace FM
455455 };
456456
457457 // YM2612/3438(OPN2) ----------------------------------------------------
458- class OPN2 : public OPN2Base
458+ class DLL_PREFIX OPN2 : public OPN2Base
459459 {
460460 public:
461461 OPN2();
--- a/source/src/vm/fmtowns/cdc.cpp
+++ b/source/src/vm/fmtowns/cdc.cpp
@@ -171,7 +171,7 @@ void CDC::enqueue_cmdqueue(int size, uint8_t data[])
171171 }
172172 next_cmdqueue = next_cmdqueue & (CDC_COMMAND_QUEUE_LENGTH - 1);
173173 }
174- return NULL;
174+ return;
175175 }
176176
177177 void CDC::start_poll_bus_free(int unit)
--- a/source/src/vm/fmtowns/ym2612.cpp
+++ b/source/src/vm/fmtowns/ym2612.cpp
@@ -7,6 +7,7 @@
77 [ YM2203 / YM2608 ]
88 */
99
10+
1011 #include "ym2612.h"
1112 #include "debugger.h"
1213 #include <math.h>
@@ -19,6 +20,7 @@
1920 static CFMDLL* fmdll = NULL;
2021 static int chip_reference_counter = 0;
2122 static bool dont_create_multiple_chips = false;
23+#else
2224 #endif
2325
2426 void YM2612::initialize()
Show on old repository browser