OSDN Git Service

[BUILD] FMGEN must be linked due to separate devices to DLL.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 3 Feb 2017 18:05:35 +0000 (03:05 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 3 Feb 2017 18:05:35 +0000 (03:05 +0900)
source/build-cmake/cmake/config_commonsource.cmake

index 8180185..3e3a035 100644 (file)
@@ -147,14 +147,13 @@ endif()
 
 if(DEFINED VM_NAME)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/${VM_NAME})
-  if(USE_FMGEN)
+#  if(USE_FMGEN)
     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fmgen)
-    if(WIN32)
+#    if(WIN32)
 #      set(FMGEN_LIB vm_fmgen)
-       else()
-         set(FMGEN_LIB "-lCSPfmgen")
-       endif()
-  endif()
+#        set(FMGEN_LIB "-lCSPfmgen")
+#      endif()
+#  endif()
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/machines/${VM_NAME})
 endif()
 
@@ -233,7 +232,7 @@ else()
 #       ${LIBAV_LIBRARIES}
        ${ADDITIONAL_LIBRARIES}
        )
-       set(BUNDLE_LIBS ${BUNDLE_LIBS} -lCSPosd ${FMGEN_LIB} -lCSPcommon_vm -lCSPgui -lCSPemu_utils -lCSPavio)
+       set(BUNDLE_LIBS ${BUNDLE_LIBS} -lCSPosd -lCSPfmgen -lCSPcommon_vm -lCSPgui -lCSPemu_utils -lCSPavio)
 endif()
 
 if(USE_QT_5)