OSDN Git Service

[BUILD][Qt][Win32] Fix FTBFS at linking.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 20 May 2016 20:24:46 +0000 (05:24 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 20 May 2016 20:24:46 +0000 (05:24 +0900)
source/build-cmake/cmake/config_commonsource.cmake
source/src/qt/common/CMakeLists.txt

index bf193fe..cbf5e2c 100644 (file)
@@ -158,7 +158,6 @@ if(WIN32)
                   ${VM_APPEND_LIBS}
                   vm_vm
                   ${FMGEN_LIB}
-                  qt_osd
                   ${DEBUG_LIBS}
                   common_common
                   )
index a349a3f..f8d7cde 100644 (file)
@@ -50,7 +50,7 @@ endif()
 if(WIN32)
  target_link_libraries(${EXEC_TARGET} 
  ${LOCAL_LIBS}
- ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPgui/build-win32/qt/gui/libqt_osd.a
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPosd/build-win32/qt/osd/libqt_osd.a
  ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPgui/build-win32/qt/gui/libqt_gui.a
  ${BUNDLE_LIBS} 
  ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPgui/build-win32/qt/gui/libqt_gui.a