mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-02-02 10:44:21 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,279 Commits 10 Branches 61 Tags
ffba37c7f2a895e8b80098d5612cee6f461bfa54
Commit Graph

52 Commits

Author SHA1 Message Date
Lukas W
f770164730 CMake: FindWine: Add aliases for finding winegcc 2015-07-06 17:40:10 +02:00
Lukas W
e0f077ba02 Merge branch 'master' into cmake_dist 
# Conflicts:
#	include/Plugin.h
#	src/core/Plugin.cpp
 2015-03-21 11:53:00 +01:00
Augustin Cavalier
48ac1b02eb DetectMachine: de-convolute 'if' maze and add Haiku. 2015-03-05 12:39:35 -05:00
Lukas W
2a0c08afa2 Fix windows build 2015-01-29 16:37:10 +01:00
Lukas W
4c0705359a OSX fix try #2 2015-01-15 22:23:26 +01:00
Lukas W
d4d26a6138 OSX fix 2015-01-15 21:35:46 +01:00
Lukas W
ce5398414c Clean BuildPlugin.cmake 2015-01-13 01:22:31 +01:00
Lukas W
38f544f9a0 Fix embedded resources 2015-01-11 22:59:27 +01:00
Tobias Doerffel
4cee046909 Added initial Qt5 support 
LMMS now properly builds and runs with Qt5. Various deprecated functions
had to be replaced like QString::toAscii()/fromAscii(). Also occurences
of FALSE/TRUE have been replaced with false/true.

LmmsStyle now derives from QProxyStyle and sets a style instance as base
style (Plastique for Qt4, Fusion for Qt5).

MOC files are not included anymore but added as regular source files.

What's missing is support for embedding VST plugins into a subwindow
inside LMMS on Linux/X11 due to missing QX11EmbedContainer class in Qt5.

Build instructions can be found in INSTALL.Qt5

Minimum version requirement for Qt4 has been raised to 4.6.0 for best
API compatibility between Qt4 and Qt5.
 2014-08-14 17:34:49 +02:00
Tobias Doerffel
059ddc2875 CMake/FindWine: search for wineg++ executable 
Instead of relying on wineg++ being in PATH search for it as it might
reside somewhere else.
 2014-05-02 00:17:42 +02:00
Tobias Doerffel
5325e635c3 CMake/FindWine: add suffix for finding library on Debian Testing 
On Debian Testing the WINE libraries reside in /usr/lib/<arch>/wine.
Therefore add according suffix to search in as well.
 2014-05-01 00:41:24 +02:00
Tobias Doerffel
e84b537a60 NSIS/FileAssociation: do not write DefaultIcon registry key 
Setting the DefaultIcon registry key uses LMMS' logo instead of a file
icon with the logo inside.

Thanks to Tres Finocchiaro for spotting the issue.
 2014-02-19 18:09:27 +01:00
Tobias Doerffel
3f6ff1deb0 Removed libsamplerate from source tree 
Drop another 3rdparty component and rely on system libraries instead.
 2014-02-18 23:40:40 +01:00
Lukas W
7f602cd6c0 Fix for #42: Make search path for plugins relative 
Makes the search path that is compiled into the lmms executable relative.
 2014-01-18 21:31:20 +01:00
Lukas W
22ca7acb81 Add FindWine module and use it in main CMakeLists.txt 
Old CheckLibraryExists implementation didn't work on my system.
A find module should be better and also easier to maintain.
 2014-01-15 17:17:29 +01:00
Tobias Doerffel
39f904117f DetectMachine.cmake: do not use lib64 as LIB_DIR anymore 
Installing to $prefix/lib64 is not usual anymore and thus we change it here
to just install all libraries to $prefix/lib.
 2014-01-12 18:20:32 +01:00
Tobias Doerffel
b65cf661a2 MinGWCrossCompile.cmake: fix cross builds with recent versions of CMake 
LMMS failed to build with recent versions of CMake if CMAKE_RC_COMPILER
was not set in MinGWCrossCompile.cmake. Furthermore PKG_CONFIG_FOUND
manually needs to be set to TRUE.
 2011-10-22 20:40:06 +02:00
Tobias Doerffel
aed2d69ff8 Build system: revised Qt4 detection for Win32/Win64 builds 
I updated the MinGW cross compiling packages to come alogn with
Qt 4.7 and a revised build architecture. Qt's devel tools such as
qmake, moc & friends are now built natively and allow using them like
native Qt installations. This means there's less to hardcode in the
MinGWCrossCompile file.
 2011-01-02 00:59:46 +01:00
Tobias Doerffel
a38c762730 Build system: removed FindPkgConfig.cmake 
Removed FindPkgConfig.cmake as it's part of all even less recent
CMake installations.
 2011-01-02 00:58:25 +01:00
Tobias Doerffel
4641fcc6d3 Audio: Re-enabled PortAudio backend 
The PortAudio backend lay down broken for quite a while. However as it
offers much better realtime capabilities on Windows compared to SDL, I
started to resurrect it, removed support for PortAudio < 1.9 and fixed
various bugs and crashes.
 2011-01-02 00:54:43 +01:00
Tobias Doerffel
65a0313807 Merge branch 'win64-vst' 
* win64-vst:
  VST support layer: fixed non-working 64 bit VST plugins
  VST support layer: added 32 bit VST plugin support for Win64
  Win64Toolchain: added 32 bit compiler configuration
  ZynAddSubFX: use new RemotePlugin::init() method
  RemotePlugin: added support for running remote process multiple times
(cherry picked from commit 65c073ec63)
 2010-12-26 11:25:54 +01:00
Tobias Doerffel
ec19be69cd Added missing FileAssociation.nsh 
Commit 07a7442758 includes the new file
FileAssociation.nsh which was not added in that commit. Fix this.
 2010-08-06 01:38:10 +02:00
Tobias Doerffel
1513b0c437 Win32Toolchain: define CFLAGS/CXXFLAGS in top level build_mingw32 script 
All flags which are used now for building Win32 version of LMMS are now
defined in the top level build_mingw32 script instead of the
Win32Toolchain cmake files.
 2010-07-25 19:22:28 +02:00
Tobias Doerffel
c59fe081ee Improved support for MinGW cross compile builds 
Cross compile support for Win32 and Win64 has been unified,
simplified and adapted to the new MinGW64-based build environment.
This finally allows to produce working Win64 binaries.
(cherry picked from commit 51103bb674)
 2010-05-17 23:43:52 +02:00
Tobias Doerffel
cc821a1a03 Win32 toolchain: various fixes + march=i686 
In build_mingw32 script fixed path to Win32Toolchain.cmake. In this
file set march=i686 and mtune=generic.
(cherry picked from commit c2e0cde213)
 2009-12-25 00:42:08 +01:00
Andrew Kelley
629c076be5 BuildPlugin.cmake: add include directory 
If libraries are being used from somewhere other than
/usr/include or /usr/local/include, building plugins would fail.
Now it checks CMAKE_INSTALL_PREFIX/include.
(cherry picked from commit a86ca968b7)
 2009-08-14 15:35:15 +02:00
Tobias Doerffel
5891a37635 Win32Toolchain: define MINGW_PREFIX and QT_HEADERS_DIR 
MINGW_PREFIX is a better variable name than CC_PREFIX (cross copmling
prefix), therefore rename it. Furthermore define QT_HEADERS_DIR due to
changed logic in CMake's FindQt4 module.
(cherry picked from commit 94ebcf30bc)
 2009-08-06 13:48:30 +02:00
Tobias Doerffel
6c7e6571e7 reflect changes in MinGW crosscompiling environment 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@2068 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2009-02-23 18:55:38 +00:00
Tobias Doerffel
12b07484aa reflect recent changes to MinGW cross compiling environment (stable backport) 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@2026 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2009-02-12 23:34:20 +00:00
Tobias Doerffel
1c7efe8696 added STK support to win32 version of LMMS (stable backport) 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@1954 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-12-17 23:26:47 +00:00
Tobias Doerffel
ef425f4460 also search top-source dir for LMMS import library for windows builds 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1807 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-10-27 22:37:12 +00:00
Tobias Doerffel
54a62a5668 added Win64Toolchain file 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1806 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-10-27 22:21:11 +00:00
Tobias Doerffel
30c7732665 various fixes for successfully building LMMS for win64 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1804 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-10-27 21:25:46 +00:00
Tobias Doerffel
63848e9b71 allow specifying destination directory for libs via CMAKE_INSTALL_LIBDIR 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1794 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-10-25 10:14:56 +00:00
Tobias Doerffel
5b99179451 do not create alsaconfig.h 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1773 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-10-18 15:19:54 +00:00
Tobias Doerffel
396dbbc1b3 * removed (buggy) PCH support 
* added support for CFLAGS and CXXFLAGS environment variables



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1717 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-09-30 11:10:52 +00:00
Tobias Doerffel
2b6e61b66c added include and library-directory of cross compiling environment 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1532 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-09-02 15:31:13 +00:00
Tobias Doerffel
d1283bc54e added support for PortAudio 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1507 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-08-27 13:51:39 +00:00
Tobias Doerffel
3eeb7b8a76 improved detection of machine type 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1493 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-08-26 09:20:54 +00:00
Tobias Doerffel
a2f33efef5 improved detection of machine type 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1492 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-08-26 09:17:29 +00:00
Tobias Doerffel
8c4abb3aec added missing dependency to bin2res-target in order to build properly when using "make -jX" 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1481 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-08-23 22:22:32 +00:00
Tobias Doerffel
67095e36b2 * made cmake-files ready for NSIS-packaging 
* added win-resource-object to LMMS-binary



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1427 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-08-01 21:09:32 +00:00
Tobias Doerffel
11b85eb323 added support for building LMMS on OS X and generating a DMG-package 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1404 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-07-28 21:35:40 +00:00
Tobias Doerffel
1a2123f69d less header-dependencies and moved some type-definitions 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1373 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-07-26 19:06:58 +00:00
Tobias Doerffel
fe55d0cdcc support for cmake < 2.4.8 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1371 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-07-23 20:19:12 +00:00
Tobias Doerffel
64c691af8a support for cmake < 2.4.8 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1369 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-07-23 18:45:37 +00:00
Tobias Doerffel
be0c5b9bc4 various fixes for allowing out-of-tree builds 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1363 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-07-22 23:50:59 +00:00
Tobias Doerffel
c7e9a130da fixed INSTALL_DATA_SUBDIRS-macro (use normal string-replace instead of regex-replace) 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1360 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-07-22 22:59:40 +00:00
Tobias Doerffel
4db1099f7f fixed clean-target 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1359 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-07-22 21:47:31 +00:00
Tobias Doerffel
c6240956ed fixes for successfully cross-compiling 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1357 0778d3d1-df1d-0410-868b-ea421aaaa00d
 2008-07-22 21:07:19 +00:00