Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-01 08:29:27 +02:00
Code Issues Releases Wiki Activity

Fix Windows build

Browse Source
This commit is contained in:
Leland Lucius 2020-07-25 13:04:48 -05:00
parent 71b4e932ad
commit e07320be9e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake-proxies/cmake-modules/FindwxWidgets.cmake
View File

@ -585,7 +585,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
if(WX_LIB_DIR) if(WX_LIB_DIR)
# If building shared libs, define WXUSINGDLL to use dllimport. # If building shared libs, define WXUSINGDLL to use dllimport.
if(WX_LIB_DIR MATCHES "[dD][lL][lL]") if(WX_LIB_DIR MATCHES "[dD][lL][lL]")
set(wxWidgets_DEFINITIONS WXUSINGDLL) set(wxWidgets_DEFINITIONS_GENERAL WXUSINGDLL)
DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}") DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
endif() endif()
@ -660,7 +660,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Add necessary definitions for unicode builds # Add necessary definitions for unicode builds
if("${UCD}" STREQUAL "u") if("${UCD}" STREQUAL "u")
list(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE) list(APPEND wxWidgets_DEFINITIONS_GENERAL UNICODE _UNICODE)
endif() endif()
# Add necessary definitions for debug builds # Add necessary definitions for debug builds
@ -933,10 +933,6 @@ else()
endif() endif()
endif() endif()
message("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
message("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
message("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
# When using wx-config in MSYS, the include paths are UNIX style paths which may or may # When using wx-config in MSYS, the include paths are UNIX style paths which may or may
# not work correctly depending on you MSYS/MinGW configuration. CMake expects native # not work correctly depending on you MSYS/MinGW configuration. CMake expects native
# paths internally. # paths internally.