hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fixes for successfully cross-compiling

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1357 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-07-22 21:07:19 +00:00
parent 53abd65d2e
commit c6240956ed
5 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
CMakeLists.txt
View File

@@ -116,7 +116,9 @@ INCLUDE(${QT_USE_FILE})
# check for libsndfile
PKG_CHECK_MODULES(SNDFILE REQUIRED sndfile>=1.0.11)
IF(NOT SNDFILE_FOUND)
MESSAGE(FATAL_ERROR "LMMS requires libsndfile >= 1.0.11 - please install and try again!")
ENDIF(NOT SNDFILE_FOUND)
IF(WANT_CAPS)
SET(LMMS_HAVE_CAPS TRUE)
@@ -129,6 +131,7 @@ ENDIF(WANT_TAP)
# check for SDL
IF(WANT_SDL)
SET(SDL_BUILDING_LIBRARY TRUE)
FIND_PACKAGE(SDL)
IF(SDL_FOUND)
SET(LMMS_HAVE_SDL TRUE)
@@ -197,7 +200,6 @@ ENDIF(NOT LMMS_HAVE_ALSA)
# check for JACK
IF(WANT_JACK)
MESSAGE(FATAL_ERROR "${WANT_JACK}")
PKG_CHECK_MODULES(JACK jack>=0.77)
IF(JACK_FOUND)
SET(LMMS_HAVE_JACK TRUE)
@@ -251,23 +253,27 @@ IF(WANT_SYSTEM_SR)
PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.3)
IF(SAMPLERATE_FOUND)
SET(LMMS_HAVE_SAMPLERATE TRUE)
ELSE(SAMPLERATE_FOUND)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate)
INCLUDE(ChecksForLibSamplerate)
SET(LIBSAMPLERATE_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.c
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_sinc.c
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/high_qual_coeffs.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/mid_qual_coeffs.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/fastest_coeffs.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/common.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/config.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/float_cast.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_zoh.c
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_linear.c)
ENDIF(SAMPLERATE_FOUND)
ENDIF(WANT_SYSTEM_SR)
IF(NOT LMMS_HAVE_SAMPLERATE)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate)
SET(CMAKE_CROSSCOMPILING_ORIG "${CMAKE_CROSSCOMPILING}")
SET(CMAKE_CROSSCOMPILING "")
INCLUDE(ChecksForLibSamplerate)
SET(LIBSAMPLERATE_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.c
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_sinc.c
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/high_qual_coeffs.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/mid_qual_coeffs.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/fastest_coeffs.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/common.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/config.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/float_cast.h
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_zoh.c
${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/samplerate/src_linear.c)
SET(CMAKE_CROSSCOMPILING "${CMAKE_CROSSCOMPILING_ORIG}")
ENDIF(NOT LMMS_HAVE_SAMPLERATE)
@@ -282,7 +288,7 @@ SET(lmms_MOC ${lmms_INCLUDES})
SET(lmms_EMBEDDED_RESOURCES AUTHORS COPYING)
QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -DLMMS_HAVE_ALSA)
QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw -DLMMS_HAVE_ALSA -DLMMS_BUILD_WIN32)
QT4_WRAP_UI(lmms_UI_out ${lmms_UI})
@@ -310,8 +316,8 @@ ADD_SUBDIRECTORY(data)
#
ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS})
INCLUDE_DIRECTORIES( include . ${SDL_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
LINK_DIRECTORIES( ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS} )
INCLUDE_DIRECTORIES(include . ${SDL_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
LINK_LIBRARIES(${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES})
ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${ER_H} ${lmms_UI_out})

6
ChangeLog
View File

@@ -1,5 +1,11 @@
2008-07-22 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* cmake/modules/Win32Toolchain.cmake:
* cmake/modules/BuildPlugin.cmake:
* src/3rdparty/samplerate/config.h:
* CMakeLists.txt:
fixes for successfully cross-compiling
* cmake/modules/Win32Toolchain.cmake:
* cmake/modules/BuildPlugin.cmake:
* plugins/ladspa_effect/tap/CMakeLists.txt:

4
cmake/modules/BuildPlugin.cmake
View File

@@ -65,6 +65,10 @@ MACRO(BUILD_PLUGIN)
FOREACH(f ${PLUGIN_SOURCES})
ADD_FILE_DEPENDENCIES(${f} ${ER_H} ${plugin_MOC_out} ${plugin_UIC_out})
ENDFOREACH(f)
IF(LMMS_BUILD_WIN32)
LINK_DIRECTORIES(${CMAKE_SOURCE_DIR})
LINK_LIBRARIES(-llmms ${QT_LIBRARIES})
ENDIF(LMMS_BUILD_WIN32)
ADD_LIBRARY(${PLUGIN_NAME} SHARED ${PLUGIN_SOURCES})
IF(LMMS_BUILD_LINUX)
INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}")

1
cmake/modules/Win32Toolchain.cmake
View File

@@ -32,4 +32,5 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
SET(PKG_CONFIG_EXECUTABLE ${CC_PREFIX}/bin/pkg-config)

4
src/3rdparty/samplerate/config.h vendored
View File

@@ -1,9 +1,5 @@
#include "lmmsconfig.h"
#ifdef LMMS_BUILD_WIN32
#define WIN32
#endif
#ifdef LMMS_HAVE_STDINT_H
#define HAVE_STDINT_H
#endif