mirror of
https://github.com/projectM-visualizer/projectm.git
synced 2026-03-07 16:05:26 +00:00
made qprojectM-* new conditional reference style (they don't work yet though?)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@806 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
@ -32,9 +32,21 @@ ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
|
||||
ADD_DEFINITIONS(${QT_DEFINITIONS})
|
||||
ADD_DEFINITIONS(-DQT_NO_DEBUG)
|
||||
|
||||
INCLUDE_DIRECTORIES(${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/qprojectM ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
|
||||
|
||||
LINK_DIRECTORIES(${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/qprojectM ${JACK_LDFLAGS})
|
||||
if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
|
||||
set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/qprojectM)
|
||||
set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/qprojectM)
|
||||
elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
|
||||
set(PROJECTM_INCLUDE ${PROJECTM_INCLUDEDIR}/libprojectM)
|
||||
set(PROJECTM_LINK ${PROJECTM_LDFLAGS})
|
||||
# qprojectM places itself in same location as (lib)projectM
|
||||
# whether it should is a whole other issue
|
||||
endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
|
||||
|
||||
|
||||
INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
|
||||
|
||||
LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS})
|
||||
|
||||
ADD_EXECUTABLE(qprojectM-jack ${qprojectM_jack_SRCS} ${qprojectM_jack_MOC_SRCS})
|
||||
|
||||
|
||||
@ -33,9 +33,20 @@ ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
|
||||
ADD_DEFINITIONS(${QT_DEFINITIONS})
|
||||
ADD_DEFINITIONS(-DQT_NO_DEBUG)
|
||||
|
||||
INCLUDE_DIRECTORIES(${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/qprojectM ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
|
||||
|
||||
LINK_DIRECTORIES(${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/qprojectM ${PROJECTM_LDFLAGS} ${PULSEAUDIO_LDFLAGS})
|
||||
if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
|
||||
set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/qprojectM)
|
||||
set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/qprojectM)
|
||||
elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
|
||||
set(PROJECTM_INCLUDE ${PROJECTM_INCLUDEDIR}/libprojectM)
|
||||
set(PROJECTM_LINK ${PROJECTM_LDFLAGS})
|
||||
# qprojectM places itself in same location as (lib)projectM
|
||||
# whether it should is a whole other issue
|
||||
endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
|
||||
|
||||
INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
|
||||
|
||||
LINK_DIRECTORIES(${PROJECTM_LINK} ${PULSEAUDIO_LDFLAGS})
|
||||
|
||||
ADD_EXECUTABLE(qprojectM-pulseaudio ${qprojectM_pulseaudio_SRCS} ${qprojectM_pulseaudio_MOC_SRCS} ${qprojectM_pulseaudio_UIS_H})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user