MSVC: Fix VST arch detection

2017-11-26 20:59:49 +01:00
parent c3d0dc5888
commit e95a587993
2 changed files with 2 additions and 3 deletions
--- a/plugins/vst_base/CMakeLists.txt
+++ b/plugins/vst_base/CMakeLists.txt
@@ -70,7 +70,6 @@ ELSEIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
 		SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin"
 		INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/../"
 		CMAKE_ARGS
-			-DCMAKE_C_COMPILER=${WINE_CXX}
 			-DCMAKE_CXX_COMPILER=${CMAKE_CURRENT_LIST_DIR}/RemoteVstPlugin/winegcc
 			-DLMMS_SOURCE_DIR=${CMAKE_SOURCE_DIR}
 			-DLMMS_BINARY_DIR=${CMAKE_BINARY_DIR}
--- a/plugins/vst_base/RemoteVstPlugin/CMakeLists.txt
+++ b/plugins/vst_base/RemoteVstPlugin/CMakeLists.txt
@@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 11)

 include(CheckCXXPreprocessor)

-CHECK_CXX_DEFINE(IS_WIN "__WIN32__")
-CHECK_CXX_DEFINE(IS_WIN64 "__WIN64__")
+CHECK_CXX_DEFINE(IS_WIN "_WIN32")
+CHECK_CXX_DEFINE(IS_WIN64 "_WIN64")

 if(NOT IS_WIN)
 	message(FATAL_ERROR "Toolchain used does not target windows.")