Browse Source

Add tweaks for qt build, off by default

Signed-off-by: falkTX <falktx@falktx.com>
pull/10/head
falkTX 1 month ago
parent
commit
01eaa618e1
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 81 additions and 0 deletions
  1. +10
    -0
      bootstrap-audacity.sh
  2. +7
    -0
      build-audacity.sh
  3. +64
    -0
      patches/audacity/04_build-fix-pt4.patch.qt

+ 10
- 0
bootstrap-audacity.sh View File

@@ -15,12 +15,18 @@ if [ -z "${target}" ]; then
exit 1
fi

using_qt=0

# ---------------------------------------------------------------------------------------------------------------------
# run bootstrap dependencies

./bootstrap-common.sh "${target}"
# ./bootstrap-plugins.sh "${target}"

if [ ${using_qt} -eq 1 ]; then
./bootstrap-qt.sh "${target}"
fi

# ---------------------------------------------------------------------------------------------------------------------
# source setup code

@@ -47,6 +53,10 @@ wxwidgets_args+=" -DwxUSE_LIBTIFF=builtin"
wxwidgets_args+=" -DwxUSE_REGEX=builtin"
wxwidgets_args+=" -DwxUSE_ZLIB=builtin"

if [ ${using_qt} -eq 1 ]; then
wxwidgets_args+=" -DwxBUILD_TOOLKIT=qt"
fi

# these match upstream cmake setup
if [ "${MACOS}" -eq 1 ]; then
wxwidgets_args+=" -DwxUSE_ACCESSIBILITY=YES"


+ 7
- 0
build-audacity.sh View File

@@ -14,6 +14,8 @@ if [ -z "${target}" ]; then
exit 1
fi

using_qt=0

# ---------------------------------------------------------------------------------------------------------------------
# run bootstrap dependency

@@ -74,6 +76,11 @@ if [ "${WIN32}" -eq 1 ]; then
export EXTRA_LDFLAGS="-lpthread -lz" # FIXME not working!
fi

if [ ${using_qt} -eq 1 ]; then
audacity_args+=" -DwxWidgets_CONFIGURATION=qtu"
export EXTRA_CXXFLAGS+=" -I${PAWPAW_PREFIX}/include/qt5"
fi

# TODO
# 1. linker flags end up with -lLIB_m-NOTFOUND
# 2. win32 build requires copying std mingw mutex workarounds


+ 64
- 0
patches/audacity/04_build-fix-pt4.patch.qt View File

@@ -0,0 +1,64 @@
diff --git a/cmake-proxies/cmake-modules/CopyLibs.cmake b/cmake-proxies/cmake-modules/CopyLibs.cmake
index ddb5d9a..eb00020 100644
--- a/cmake-proxies/cmake-modules/CopyLibs.cmake
+++ b/cmake-proxies/cmake-modules/CopyLibs.cmake
@@ -95,7 +95,8 @@ function( gather_libs src )
set( postcmds ${postcmds} PARENT_SCOPE )
endfunction()
-gather_libs( "${SRC}" )
+set( libs "${WXWIN}/wxqt313u_gcc_x64_custom.dll" )
+set( postcmds "" )
list( REMOVE_DUPLICATES libs )
diff --git a/cmake-proxies/cmake-modules/FindwxWidgets.cmake b/cmake-proxies/cmake-modules/FindwxWidgets.cmake
index cb2f6f6..b5c88a6 100644
--- a/cmake-proxies/cmake-modules/FindwxWidgets.cmake
+++ b/cmake-proxies/cmake-modules/FindwxWidgets.cmake
@@ -217,15 +217,7 @@ endif()
if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Useful common wx libs needed by almost all components.
set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
-
- # DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead.
- if(NOT wxWidgets_FIND_COMPONENTS)
- if(wxWidgets_USE_MONOLITHIC)
- set(wxWidgets_FIND_COMPONENTS mono)
- else()
- set(wxWidgets_FIND_COMPONENTS core base) # this is default
- endif()
- endif()
+ set(wxWidgets_FIND_COMPONENTS mono)
# Add the common (usually required libs) unless
# wxWidgets_EXCLUDE_COMMON_LIBRARIES has been set.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79e8f3c..e4c0f62 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1120,14 +1120,16 @@ if( CMAKE_SYSTEM_NAME MATCHES "Windows" )
POST_BUILD
)
- # Copy the VC runtime libraries as well
- add_custom_command(
- TARGET
- ${TARGET}
- COMMAND
- ${CMAKE_COMMAND} -E copy ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${_DEST}
- POST_BUILD
- )
+ if(MSVC)
+ # Copy the VC runtime libraries as well
+ add_custom_command(
+ TARGET
+ ${TARGET}
+ COMMAND
+ ${CMAKE_COMMAND} -E copy ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${_DEST}
+ POST_BUILD
+ )
+ endif(MSVC)
elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
# Bug 2400 workaround
#

Loading…
Cancel
Save