hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
6,904 Commits 9 Branches 62 Tags
187fbf419167c2e7998c1dea183c8564c4d4a39e
Commit Graph

189 Commits

Author SHA1 Message Date
Hyunjin Song
d9b91338ea Fix finding pkg-config on cross compile 
Switch back to `ENV{PKG_CONFIG}` to ensure that
FindPkgConfig doesn't overwrite `PKG_CONFIG_EXECUTABLE`.
Since CMake 3.3 supports the environment variable,
it's safe to use that.
 2018-11-22 14:01:23 +09:00
Hyunjin Song
4252f755c2 Merge branch 'stable-1.2' 
# Conflicts:
#	cmake/nsis/CMakeLists.txt
#	src/core/ProjectRenderer.cpp
#	src/tracks/Pattern.cpp
 2018-10-29 16:20:58 +09:00
Hyunjin Song
9799f3ca1c Fix Carla detection in AppImage launcher script 
Fixes a typo which hardcodes Carla path at the packaging time.
 2018-10-04 14:24:52 +09:00
Tres Finocchiaro
0dc1bdbb68 Minor cmake fixes (#4636) 
Minor cmake fixes
 2018-09-30 21:30:56 -04:00
Umcaruje
8154f886ed Update the LMMS logo and mimetypes (#4519) 
* Update the LMMS logo and mimetypes

* fix bmp for nsis installer

* Update window and About icons, rename icons, change the file association logic

* Fix NSIS

* Revert nsh patch

* Fix small icon

* Always write DefaultIcon in the registry

* Fix file permissions

* Fix nsis branding

* Fix nsis branding #2

* update the icon windows and linux

* Update apple icon, add windows visual manifest

* try to fix windows installation

* typo

* typo 2

* Set small logo to conform to 48x48 grid
 2018-09-24 11:09:49 +02:00
Johannes Lorenz
93dc557c56 Add bash completion (#4534) (#4604) 
* Add bash completion (#4534)
 2018-09-23 21:17:39 -04:00
Hyunjin Song
4069aaada2 Merge branch 'stable-1.2' 
# Conflicts:
#	.travis/osx..install.sh
#	CMakeLists.txt
#	cmake/apple/install_apple.sh.in
#	doc/lmms.1
#	include/VstSyncController.h
#	plugins/carlabase/carla.h
#	plugins/vestige/vestige.cpp
#	plugins/vst_base/CMakeLists.txt
#	plugins/vst_base/RemoteVstPlugin.cpp
#	plugins/vst_base/Win64/CMakeLists.txt
#	plugins/zynaddsubfx/zynaddsubfx
#	plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
#	src/core/Song.cpp
#	src/core/main.cpp
 2018-09-18 09:54:38 +09:00
Tres Finocchiaro
153f15f4b4 Add Carla support for MacOS (#4558) 
Add Carla support for MacOS
 2018-09-15 09:32:29 -04:00
Hyunjin Song
763c08b8b6 Fix typo in previous merge 2018-08-25 08:51:29 +09:00
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
2ecc8bb4fa Add CMake 2 support (#4530) 
Partially reverts d599955
 2018-08-07 15:26:58 -04: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