mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-05 06:05:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix some build errors which occur on some machines

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1367 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
ximion
2012-01-01 17:52:07 +00:00
parent 0edab86a1f
commit d082cbabbe
5 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libprojectM/CMakeLists.txt
View File

@ -46,11 +46,11 @@ SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
if (USE_NATIVE_GLEW)
ADD_DEFINITIONS(-DUSE_NATIVE_GLEW)
SET(GLEW_SOURCES glew.h glew.c)
SET(GLEW_LINK_TARGETS )
SET(GLEW_SOURCES glew.h glew.c)
SET(GLEW_LIBRARY "")
else(USE_NATIVE_GLEW)
SET(GLEW_SOURCES )
SET (GLEW_LINK_TARGETS GLEW)
set (GLEW_SOURCES "")
find_package (GLEW)
endif(USE_NATIVE_GLEW)
SET(projectM_SOURCES projectM.cpp PCM.cpp Preset.cpp fftsg.cpp KeyHandler.cpp

4
src/libprojectM/Renderer/CMakeLists.txt
View File

@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.4.0)
SET(SOIL_SOURCES SOIL/image_DXT.c SOIL/image_helper.c SOIL/SOIL.c SOIL/stb_image_aug.c)
SET(Renderer_SOURCES FBO.cpp MilkdropWaveform.cpp PerPixelMesh.cpp Pipeline.cpp Renderer.cpp ShaderEngine.cpp UserTexture.cpp Waveform.cpp
Filters.cpp PerlinNoise.cpp PipelineContext.cpp Renderable.cpp BeatDetect.cpp Shader.cpp TextureManager.cpp VideoEcho.cpp
SET(Renderer_SOURCES FBO.cpp MilkdropWaveform.cpp PerPixelMesh.cpp Pipeline.cpp Renderer.cpp ShaderEngine.cpp UserTexture.cpp Waveform.cpp
Filters.cpp PerlinNoise.cpp PipelineContext.cpp Renderable.cpp BeatDetect.cpp Shader.cpp TextureManager.cpp VideoEcho.cpp
RenderItemDistanceMetric.cpp RenderItemMatcher.cpp ${SOIL_SOURCES})
IF(NOT MSVC)

23
src/libprojectM/cmake/FindGLEW.cmake Normal file
View File

@ -0,0 +1,23 @@
# - Try to find GLEW
# Once done this will define
#
# GLEW_FOUND - system has GLEW
# GLEW_INCLUDE_DIR - the GLEW include directory
# GLEW_LIBRARY - Link these to use GLEW
#
FIND_PATH( GLEW_INCLUDE_DIR glew.h wglew.h
PATHS /usr/local /usr c:/glew "C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK" "C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK"
PATH_SUFFIXES include include/gl include/GL Include Include/gl Include/GL )
FIND_LIBRARY( GLEW_LIBRARY
NAMES glew32 glew GLEW
PATHS /usr /usr/local c:/glew "C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK" "C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK"
PATH_SUFFIXES lib Lib
)
IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
SET(GLEW_FOUND TRUE)
SET( GLEW_LIBRARY_DIR ${GLEW_LIBRARY} )
ELSE (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
SET( GLEW_FOUND FALSE )
ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)

4
src/libprojectM/libprojectM.pc.in
View File

@ -9,5 +9,5 @@ Name: libprojectM
Version: 2.0.0
Description: projectM - OpenGL Milkdrop
Requires:
Libs: -L${libdir} -lprojectM
Cflags: -I${includedir}
Libs: -L${libdir} -lprojectM
Cflags: -I${includedir}

9
src/projectM-qt/CMakeLists.txt
View File

@ -6,6 +6,7 @@ cmake_policy(SET CMP0005 OLD)
include(cmake/CPack-projectM.cmake)
include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
include(FindPkgConfig.cmake)
if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
set(LIBPROJECTM_FOUND true)
@ -34,7 +35,7 @@ endif(LIBPROJECTM_FOUND)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM-qt.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM-qt.pc" @ONLY)
ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"')
ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX="\"${PROJECTM_PREFIX}\"")
ADD_DEFINITIONS(${QT_DEFINITIONS})
ADD_DEFINITIONS(-DQT_PLUGIN)
ADD_DEFINITIONS(-DQT_NO_DEBUG)
@ -97,7 +98,7 @@ qt4_wrap_cpp(projectM-qt_MOC_SRCS ${projectM-qt_MOC_HDRS})
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
endif(COMMAND cmake_policy)
endif(COMMAND cmake_policy)
if (BUILD_PROJECTM_QT_STATIC)
ADD_LIBRARY(projectM-qt STATIC ${projectM-qt_SRCS} ${projectM-qt_RC_SRCS} ${projectM-qt_MOC_SRCS} ${projectM-qt_UIS_H})
@ -105,6 +106,8 @@ else(BUILD_PROJECTM_QT_STATIC)
ADD_LIBRARY(projectM-qt SHARED ${projectM-qt_SRCS} ${projectM-qt_RC_SRCS} ${projectM-qt_MOC_SRCS} ${projectM-qt_UIS_H})
endif(BUILD_PROJECTM_QT_STATIC)
set_property(TARGET projectM-qt PROPERTY LINK_INTERFACE_LIBRARIES "")
set_property(TARGET projectM-qt PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "")
SET_TARGET_PROPERTIES(projectM-qt PROPERTIES VERSION 1.10 SOVERSION 1)
if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
@ -120,7 +123,7 @@ LINK_DIRECTORIES(${PROJECTM_LINK})
include_directories(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${CMAKE_CURRENT_LIBRARY_DIR})
# link the "qprojectM" target against the Qt libraries. which libraries exactly, is defined by the "include(${QT_USE_FILE})" line above, which sets up this variable.
target_link_libraries(projectM-qt projectM ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt)
install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX})