Fix MSVC VST compilation #4421
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| #!/bin/sh | ||
| # Wrapper script for winegcc to remove .exe file ending automatically | ||
| # appended by winebuild. | ||
| # Usage: winegcc <args ...> | ||
|
There was a problem hiding this comment. Your usage says # Usage: winegcc_wrapper <args ...>
# --- OR ---
# Usage:
# CONFIGURE_FILE("path/to/winegcc_wrapper.in winegcc_wrapper @ONLY)
# SET(WINEGCC "path/to/winegcc_wrapper")
# winegcc <args ...>Probably nitpicking, but didn't know if it was a typo or intentional. :) There was a problem hiding this comment. This wasn't intentional, I don't even know why I wrote this in the first place. :) Although your version is definitely better, I think I'll replace it with a note to |
||
|
|
||
| set -e | ||
|
|
||
| args="$@" | ||
|
|
||
| # Find output name, link mode and architecture | ||
| while [ $# -gt 0 ]; do | ||
| key="$1" | ||
|
|
||
| case $key in | ||
| -o) | ||
| output=$2 | ||
| shift | ||
| ;; | ||
| -c) | ||
| no_link=true | ||
| ;; | ||
| -m32) | ||
| win32=true | ||
| ;; | ||
| *) | ||
|
|
||
| ;; | ||
| esac | ||
|
|
||
| shift | ||
| done | ||
|
|
||
| if [ -z "$output" ]; then | ||
| # If -c is used without specifying an output name, GCC defaults to "a.out". | ||
| if [ "$no_link" != true ]; then | ||
| output="a.out" | ||
| no_move=true | ||
| fi | ||
| fi | ||
|
|
||
| # Some Wine distributions can't find their own headers. WINE_INCLUDE_DIR provided | ||
| # by FindWine.cmake | ||
| extra_args="-I@WINE_INCLUDE_DIR@" | ||
|
|
||
| # Apply -m32 library fix if necessary | ||
| if [ "$win32" = true ] && [ "$no_link" != true ]; then | ||
| extra_args="$extra_args @WINE_32_FLAGS@" | ||
| fi | ||
|
|
||
| # Run winegcc | ||
| export WINEBUILD=@WINE_BUILD@ | ||
| @WINE_CXX@ $extra_args $args | ||
|
|
||
| if [ "$no_move" = true ] || [ "$no_link" = true ]; then | ||
| exit 0 | ||
| fi | ||
|
|
||
| if [ ! -e "$output.exe" ]; then | ||
| echo "Fatal error in winegcc wrapper: No output file \"$output.exe\" found." | ||
| exit 1 | ||
| fi | ||
|
|
||
| mv $output.exe $output | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
|
|
||
| macro(CHECK_CXX_PREPROCESSOR VAR DIRECTIVE) | ||
| string(RANDOM DEFINED_KEY) | ||
| string(RANDOM UNDEFINED_KEY) | ||
|
|
||
| set(TMP_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/CxxTmp/src.cpp") | ||
| SET(SRC " | ||
| #if ${DIRECTIVE} | ||
| #error ${DEFINED_KEY} | ||
| #else | ||
| #error ${UNDEFINED_KEY} | ||
| #endif | ||
| ") | ||
| file(WRITE ${TMP_FILENAME} "${SRC}") | ||
| try_compile(RESULT_VAR | ||
| ${CMAKE_CURRENT_BINARY_DIR} | ||
| ${TMP_FILENAME} | ||
| OUTPUT_VARIABLE OUTPUT_VAR | ||
| ) | ||
|
|
||
| if(OUTPUT_VAR MATCHES ${DEFINED_KEY}) | ||
| set(${VAR} ON) | ||
| elseif(OUTPUT_VAR MATCHES ${UNDEFINED_KEY}) | ||
| set(${VAR} OFF) | ||
| else() | ||
| message(FATAL_ERROR "Can't determine if \"${DIRECTIVE}\" is true.") | ||
| endif() | ||
| endmacro() | ||
|
|
||
|
|
||
| macro(CHECK_CXX_DEFINE VAR DEFINE) | ||
| CHECK_CXX_PREPROCESSOR(${VAR} "defined(${DEFINE})") | ||
| endmacro() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,11 +9,18 @@ | |
|
|
||
| LIST(APPEND CMAKE_PREFIX_PATH /opt/wine-stable /opt/wine-devel /opt/wine-staging /usr/lib/wine/) | ||
|
|
||
|
|
||
| FIND_PATH(WINE_INCLUDE_DIR wine/exception.h PATH_SUFFIXES wine) | ||
| FIND_PROGRAM(WINE_CXX | ||
| NAMES wineg++ winegcc winegcc64 winegcc32 winegcc-stable | ||
| PATHS /usr/lib/wine) | ||
| FIND_PROGRAM(WINE_BUILD NAMES winebuild) | ||
|
|
||
| SET(_ARCHITECTURE ${CMAKE_LIBRARY_ARCHITECTURE}) | ||
|
|
||
| FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine i386-linux-gnu/wine) | ||
|
|
||
| SET(CMAKE_LIBRARY_ARCHITECTURE ${_ARCHITECTURE}) | ||
|
|
||
| SET(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} ) | ||
| SET(WINE_LIBRARIES ${WINE_LIBRARY} ) | ||
|
|
@@ -24,6 +31,10 @@ STRING(REPLACE " " ";" WINEBUILD_FLAGS "${WINEBUILD_OUTPUT}") | |
|
|
||
| FOREACH(FLAG ${WINEBUILD_FLAGS}) | ||
| IF("${FLAG}" MATCHES "libwinecrt0.a.*") | ||
| STRING(REGEX REPLACE "/wine/libwinecrt0.a.*" "" FLAG "${FLAG}") | ||
|
|
||
| SET(WINE_64_LIBRARY_DIR "${FLAG}/") | ||
|
There was a problem hiding this comment. Unusual, but it is possible to use 32-bit WINE toolchain There was a problem hiding this comment. Is that something we have supported before and that this PR breaks? There was a problem hiding this comment.
It's an issue when building 64-bit VST on Linux, so no. |
||
|
|
||
| # Debian systems | ||
| STRING(REPLACE "/lib/x86_64-" "/lib/i386-" FLAG "${FLAG}") | ||
| # Fedora systems | ||
|
|
@@ -33,12 +44,19 @@ FOREACH(FLAG ${WINEBUILD_FLAGS}) | |
| # WineHQ (/opt/wine-stable, /opt/wine-devel, /opt/wine-staging) | ||
| STRING(REPLACE "/lib64/wine/" "/lib/wine/" FLAG "${FLAG}") | ||
|
|
||
|
There was a problem hiding this comment. This logic doesn't work anymore because we drop
There was a problem hiding this comment. Thanks for tracking this down. Fixed with 515fefa. |
||
| SET(WINE_32_LIBRARY_DIR "${FLAG}/") | ||
| ENDIF() | ||
| ENDFOREACH() | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(Wine DEFAULT_MSG WINE_CXX WINE_LIBRARIES WINE_INCLUDE_DIRS) | ||
|
|
||
| mark_as_advanced(WINE_INCLUDE_DIR WINE_LIBRARY WINE_CXX WINE_BUILD) | ||
|
|
||
| IF(WINE_32_LIBRARY_DIR) | ||
| SET(WINE_32_FLAGS "-L${WINE_32_LIBRARY_DIR}wine/ -L${WINE_32_LIBRARY_DIR}") | ||
| ENDIF() | ||
|
|
||
| # Create winegcc wrapper | ||
| configure_file(${CMAKE_CURRENT_LIST_DIR}/../linux/winegcc_wrapper.in winegcc_wrapper @ONLY) | ||
| SET(WINEGCC "${CMAKE_CURRENT_BINARY_DIR}/winegcc_wrapper") | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Won't this mark the build as successful if AppImage creation is failed? I think it's fine if desired though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps
make appimage || cat appimage.log && falseThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there should be a pair of parenthesis:
make appimage || (cat appimage.log && false)See also: https://unix.stackexchange.com/questions/88850/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@PhysSong tested, confirmed...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think if appimage creation fails, it will fail one line later in
cp ./lmms-*.AppImage /tmp/artifacts/. I'll still add the&& falseto make sure.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True, I just missed that.