From dc829f48af29a7c5e428e2f9727385dd9fc95c08 Mon Sep 17 00:00:00 2001 From: Karmo Rosental Date: Wed, 19 Jul 2017 22:46:27 +0300 Subject: [PATCH] Added support for wine-stable from WineHQ repositories. (#3708) Added support for wine-stable from WineHQ repositories. --- cmake/modules/FindWine.cmake | 2 +- plugins/vst_base/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/modules/FindWine.cmake b/cmake/modules/FindWine.cmake index 963e50f4c..8dae6f2eb 100644 --- a/cmake/modules/FindWine.cmake +++ b/cmake/modules/FindWine.cmake @@ -7,7 +7,7 @@ # WINE_DEFINITIONS - Compiler switches required for using wine # -LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-devel /opt/wine-staging) +LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-stable /opt/wine-devel /opt/wine-staging) FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine) FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine i386-linux-gnu/wine) diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt index 0bd4fe0e1..f92bb916e 100644 --- a/plugins/vst_base/CMakeLists.txt +++ b/plugins/vst_base/CMakeLists.txt @@ -43,6 +43,10 @@ IF(LMMS_HOST_X86_64) IF("${WINEBUILD_OUTPUT}" MATCHES "/usr/lib/lib64/wine/libwinecrt0.a.*") SET(EXTRA_FLAGS ${EXTRA_FLAGS} -nodefaultlibs /usr/lib/i386/wine/libwinecrt0.a -luser32 -lkernel32 -lgdi32) ENDIF() + # Wine stable + IF("${WINEBUILD_OUTPUT}" MATCHES "/opt/wine-stable/lib64/wine/libwinecrt0.a.*") + SET(EXTRA_FLAGS ${EXTRA_FLAGS} -nodefaultlibs /opt/wine-stable/lib/wine/libwinecrt0.a -luser32 -lkernel32 -lgdi32) + ENDIF() # Wine development IF("${WINEBUILD_OUTPUT}" MATCHES "/opt/wine-devel/lib64/wine/libwinecrt0.a.*") SET(EXTRA_FLAGS ${EXTRA_FLAGS} -nodefaultlibs /opt/wine-devel/lib/wine/libwinecrt0.a -luser32 -lkernel32 -lgdi32)