Hyunjin Song
12d251cc3e
Merge branch 'stable-1.2'
...
# Conflicts:
# cmake/linux/package_linux.sh.in
# data/locale/cs.ts
2018-08-24 09:50:36 +09:00
Tres Finocchiaro
b5dc70c20a
Fix AppImage shim launcher
...
Due to upstream change in linuxdeployqt
2018-08-05 23:53:49 -04:00
Lukas W
792cf7a262
CMake: Fix FindFFTW pkg-config bug
...
Remove the REQUIRED flag from pkg_check_modules for when pkg-config is
available but cannot locate FFTW.
2018-07-29 14:03:36 +02:00
Lukas W
515fefa6ce
Winewrapper fixes ( #4501 )
...
* Fix library fix regression from 38f6371de6
* Fix missing windows include directory
2018-07-26 18:37:35 +02:00
Lukas W
ce4c01246b
Merge branch 'PJ-Finlay-stable-1.2'
...
# Conflicts:
# CMakeLists.txt
2018-07-22 11:55:22 +02:00
Lukas W
63fd427c5e
CMake: Minor uninstall changes
...
* Fix missing CMAKE_UNINSTALL_PREFIX variable
* Use CMAKE_MINIMUM_REQUIRED instead of CMAKE_POLICY for IN_LIST support
* Use FILE(REMOVE …) instead of EXECUTE_PROCESS(…) for better performance
* Control flow changes
2018-07-22 11:41:54 +02:00
P.J. Finlay
020ce8e4db
Added an uninstall target for make
2018-07-21 21:42:54 -04:00
Lukas W
ff1c30e35d
Merge remote-tracking branch 'lukas/cleanup/qt4'
...
# Conflicts:
# cmake/toolchains/common/MSYS.cmake
2018-07-17 08:52:49 +02:00
Lukas W
8cca464c27
CMake: Add support for clcache
2018-07-17 08:49:13 +02:00
Lukas W
3a7b5207b4
CMake: Fix mismatching if condition error
...
Regression from c45a21aac3
2018-07-11 21:56:50 +02:00
Lukas W
cce730ebff
Add CMake find modules for FFTW, LibSampleratae and LibSndFile.
...
Removes reliance on pkg-config for finding these libraries.
2018-07-11 19:57:09 +02:00
Lukas W
156c134301
winegcc_wrapper: Remove misleading usage hint
...
winegcc_wrapper.in is only intended to be used within FindWine.cmake. Also
moved it to the same directory for this reason.
2018-07-07 17:16:08 +02:00
Lukas W
38f6371de6
Fix AppImage 64bit RemoteVstPlugin libwine discovery
2018-07-07 17:16:08 +02:00
Lukas W
b4d6332632
Fix AppImage VST
2018-07-07 17:16:08 +02:00
Lukas W
fe2483e309
Enable 64bit VSTs on Linux
...
* Remove trial-and-error approach of detecting VST's machine types. Read PE
headers instead.
* Add RemoteVstPlugin64 to AppImage
2018-07-07 17:16:08 +02:00
justnope
f2a8f56944
MSVC fixes ( #4352 )
...
* locale: using path instead of individual files to reduce command line size
* remotevstplugin: changed order return type & calling convention (compiler error)
* lmmsobj: removed single quotes for command line defines
* added vcpkg support & std::make_unique for MSVC
* carla: include exports header
* package_linux: corrected RemoteVstPlugin name
* vstbase: toolchain file conditional on MSVC
* Added install for remotevstplugin
* msvc: installer works with vcpkg
Remotevst 64bit install removed due to an ApImage problem
2018-07-07 17:16:08 +02:00
Lukas W
90799d91ea
Mingw64 compilation fixes
2018-07-07 17:16:08 +02:00
Lukas W
48cdce9a79
Fix compilation with MinGW versions without threads support
...
Older versions of MinGW don't provide std::mutex or std::thread
2018-07-07 17:16:08 +02:00
Lukas W
bba072d54e
VST build fixes
2018-07-07 17:16:08 +02:00
Lukas W
ea154694f9
Fix Linux VST compilation
2018-07-07 17:16:02 +02:00
Lukas W
47a5248d1d
Linux compile fixes
2018-07-07 16:40:37 +02:00
Lukas W
1027386113
CMake: Fix MSVC architecture detection
2018-07-07 16:40:33 +02:00
Lukas W
966bf1c6de
Use CMake GenerateExportHeader
2018-07-07 11:20:54 +02:00
Lukas W
a7b0c99242
MSYS compilation fixes
...
* Fix MSYS and processor detection when not using the provided toolchain
file
* Fix creation of import library (ENABLE_EXPORTS not working)
2018-07-06 15:58:29 +02:00
Lukas W
3c6f200beb
Merge branch 'stable-1.2'
...
# Conflicts:
# cmake/modules/BuildPlugin.cmake
# plugins/CMakeLists.txt
# plugins/LadspaEffect/swh/CMakeLists.txt
# plugins/LadspaEffect/tap/CMakeLists.txt
# plugins/zynaddsubfx/zynaddsubfx
# plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
# src/gui/MainWindow.cpp
2018-07-06 12:42:15 +02:00
Lukas W
c45a21aac3
CMake: Fix FindSndio module
...
Fixes a bug where the module would set SNDIO_LIBRARY to NOT-FOUND
resulting in a CMake error when trying to link to ${SNDIO_LIBRARY}.
2018-06-20 08:47:10 +02:00
Lukas W
d1c36d7b96
CMake: Fix errors when path contains spaces
2018-06-20 08:47:10 +02:00
Lukas W
da1c78ce86
Remove Qt4 compatibility code
2018-06-17 12:47:12 +02:00
Hyunjin Song
0fa7fbde0f
Fix MSYS2 build
2018-05-22 11:45:41 +02:00
Hyunin Song
8a41def616
Merge branch 'stable-1.2'
...
# Conflicts:
# .circleci/config.yml
# .travis/osx..install.sh
# CMakeLists.txt
# plugins/zynaddsubfx/zynaddsubfx
# plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h
# plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
# plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
# plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp
# src/CMakeLists.txt
# src/core/Track.cpp
# src/tracks/Pattern.cpp
2018-05-01 09:59:07 +09:00
Lukas W
4ff993e2a4
Update CircleCI to Ubuntu 18.04
2018-04-28 11:15:09 +02:00
Lukas W
418bcce402
AppImage: Use wget -N instead of mtime logic
2018-04-22 14:05:20 +02:00
Lukas W
d9ea65ad7f
Fix AppImage build with missing fuse support
2018-04-22 14:05:20 +02:00
Lukas W
19bc0439a6
Fix mingw pkg-config
2018-04-22 14:05:20 +02:00
Tres Finocchiaro
22ca47abba
Disable fluidsynth audio backends if possible ( #4300 )
...
Closes #649
Partially reverts #3446
2018-04-20 15:46:13 -04:00
Hyunjin Song
0850b78104
Try git fetch for unadvertised object error
...
Fixes fetching submodules from non-default branches.
2018-04-13 13:50:12 +09:00
Tres Finocchiaro
1df461d64d
Fix VSTs on Fedora 27 ( #4276 )
2018-03-30 14:13:31 -04:00
Hyunin Song
0a5d056bdb
Merge branch 'stable-1.2'
...
# Conflicts:
# .travis/osx..install.sh
# .travis/osx..script.sh
# cmake/linux/package_linux.sh.in
# data/locale/en.ts
# src/core/CMakeLists.txt
# src/core/ProjectRenderer.cpp
# src/gui/FileBrowser.cpp
2018-03-07 23:54:28 +09:00
Hyunjin Song
ec0f47e9e3
Fix AppImage tool path
2018-03-07 23:27:28 +09:00
tresf
fc9c3eadef
Fix the AppImages
2018-02-27 01:54:26 -05:00
tresf
edc8f43d5b
Use bundled jack if missing
...
Closes #4094
2018-02-27 01:54:26 -05:00
Tres Finocchiaro
3980e54667
Better wine prefix detection ( #4176 )
...
Closes #4108
2018-02-23 13:20:35 -05:00
tresf
9f08e285bb
Fix $PATH for creating AppImages
2018-01-07 02:37:11 -05:00
Tres Finocchiaro
7f9d01e3b6
Enable auto-uploading of PRs ( #4041 )
...
Removes Qt4 from build system
Uploads PRs to transfer.sh
2017-12-23 02:23:32 -05:00
Hyunin Song
59cfcf41a7
Merge branch 'stable-1.2'
...
# Conflicts:
# .travis/linux..before_install.sh
# .travis/linux..install.sh
# .travis/linux..script.sh
# cmake/linux/package_linux.sh.in
# include/AudioWeakJack.def
# plugins/vst_base/CMakeLists.txt
# plugins/zynaddsubfx/zynaddsubfx
2017-12-20 14:16:16 +09:00
tresf
1279244e50
Add $HOME/bin to PATH
...
Circumvent change in appimagetool, per AppImage/AppImageKit#592
2017-12-18 18:55:51 -05:00
Tres Finocchiaro
d711b8b55e
Add Carla Support to AppImage ( #4026 )
...
Build AppImage with Carla support
* Disables HiDPI support in the AppImages
* Ignores deprecated jack usage
* Fix Carla compilation warnings
* Detects carla prefix in AppRun
2017-12-01 13:19:44 -05:00
Lukas W
aa1406bac9
Merge pull request #4000 from LMMS/fix/msvc
...
MSVC fixes
2017-11-24 11:58:12 +01:00
Hyunin Song
90b1fb57f0
Merge brnach 'stable-1.2'
2017-11-24 09:56:08 +09:00
Lukas W
8f3ab4b1b0
Merge branch 'master' into fix/msvc
...
# Conflicts:
# plugins/LadspaEffect/CMakeLists.txt
# plugins/Xpressive/Xpressive.cpp
# plugins/opl2/CMakeLists.txt
# plugins/papu/CMakeLists.txt
# plugins/xpressive/CMakeLists.txt
# src/CMakeLists.txt
2017-11-22 17:34:22 +01:00