mirror of
https://github.com/projectM-visualizer/projectm.git
synced 2026-03-04 06:25:08 +00:00
added native glew implementation to projectM-engine (optionally use)
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1000 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
@ -863,6 +863,8 @@
|
||||
516FA5440DCBFFD400465570 /* wipemalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516FA4CC0DCBFFD400465570 /* wipemalloc.cpp */; };
|
||||
516FA5450DCBFFD400465570 /* wipemalloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 516FA4CD0DCBFFD400465570 /* wipemalloc.h */; };
|
||||
51713B840DB9CCB80050BE40 /* Algorithms.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 51713B830DB9CCB80050BE40 /* Algorithms.hpp */; };
|
||||
517236120DCD5DFC0057707C /* glew.c in Sources */ = {isa = PBXBuildFile; fileRef = 517236100DCD5DFC0057707C /* glew.c */; };
|
||||
517236130DCD5DFC0057707C /* glew.h in Headers */ = {isa = PBXBuildFile; fileRef = 517236110DCD5DFC0057707C /* glew.h */; };
|
||||
517524BC0DBC47FE00D47C49 /* configfile.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 517524410DBC47FE00D47C49 /* configfile.o */; };
|
||||
517524BD0DBC47FE00D47C49 /* moc_qplaylistfiledialog.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 517524490DBC47FE00D47C49 /* moc_qplaylistfiledialog.o */; };
|
||||
517524BE0DBC47FE00D47C49 /* moc_qplaylistmodel.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 5175244A0DBC47FE00D47C49 /* moc_qplaylistmodel.o */; };
|
||||
@ -2776,6 +2778,8 @@
|
||||
516FA4CD0DCBFFD400465570 /* wipemalloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wipemalloc.h; path = "../projectM-engine/wipemalloc.h"; sourceTree = SOURCE_ROOT; };
|
||||
516FA5490DCC051600465570 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = "../projectM-jack/CMakeLists.txt"; sourceTree = SOURCE_ROOT; };
|
||||
51713B830DB9CCB80050BE40 /* Algorithms.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Algorithms.hpp; path = "../projectM-engine/Algorithms.hpp"; sourceTree = SOURCE_ROOT; };
|
||||
517236100DCD5DFC0057707C /* glew.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = glew.c; path = "../projectM-engine/glew.c"; sourceTree = SOURCE_ROOT; };
|
||||
517236110DCD5DFC0057707C /* glew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = glew.h; path = "../projectM-engine/glew.h"; sourceTree = SOURCE_ROOT; };
|
||||
517524390DBC47FD00D47C49 /* cmake_install.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cmake_install.cmake; sourceTree = "<group>"; };
|
||||
5175243B0DBC47FE00D47C49 /* CMakeDirectoryInformation.cmake */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CMakeDirectoryInformation.cmake; sourceTree = "<group>"; };
|
||||
5175243C0DBC47FE00D47C49 /* progress.make */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = progress.make; sourceTree = "<group>"; };
|
||||
@ -3163,6 +3167,8 @@
|
||||
0C4C736B09DDBB7100126FB8 /* projectM-engine */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
517236100DCD5DFC0057707C /* glew.c */,
|
||||
517236110DCD5DFC0057707C /* glew.h */,
|
||||
516FA2F10DCBFFCF00465570 /* BeatDetect.cpp */,
|
||||
516FA2F20DCBFFCF00465570 /* BeatDetect.hpp */,
|
||||
516FA2F30DCBFFCF00465570 /* BuiltinFuncs.cpp */,
|
||||
@ -4843,6 +4849,7 @@
|
||||
516FA5410DCBFFD400465570 /* timer.h in Headers */,
|
||||
516FA5430DCBFFD400465570 /* win32-dirent.h in Headers */,
|
||||
516FA5450DCBFFD400465570 /* wipemalloc.h in Headers */,
|
||||
517236130DCD5DFC0057707C /* glew.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@ -5049,6 +5056,7 @@
|
||||
516FA5400DCBFFD400465570 /* timer.cpp in Sources */,
|
||||
516FA5420DCBFFD400465570 /* win32-dirent.cpp in Sources */,
|
||||
516FA5440DCBFFD400465570 /* wipemalloc.cpp in Sources */,
|
||||
517236120DCD5DFC0057707C /* glew.c in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
||||
@ -7,18 +7,28 @@ OPTION (USE_FBO "Use Framebuffer Objects for increased rendering quality. Disab
|
||||
OPTION (USE_GLES1 "Use OpenGL ES 1.x" OFF)
|
||||
|
||||
|
||||
OPTION (USE_NATIVE_GLEW "Use projectM's native implemention of GLEW." ON)
|
||||
|
||||
#OPTION (FTGL_STATIC "Build the projectM target library in the platform's native static (NOT shared) format." OFF)
|
||||
|
||||
OPTION (BUILD_PROJECTM_STATIC "Build the projectM target library in the platform's native static (NOT shared) format." OFF)
|
||||
|
||||
SET(SOIL_SOURCES image_DXT.c image_helper.c SOIL.c stb_image_aug.c)
|
||||
|
||||
if (USE_NATIVE_GLEW)
|
||||
SET(GLEW_SOURCES glew.h glew.c)
|
||||
SET(GLEW_LINK_TARGETS )
|
||||
else(USE_NATIVE_GLEW)
|
||||
SET(GLEW_SOURCES )
|
||||
SET (GLEW_LINK_TARGETS GLEW)
|
||||
endif(USE_NATIVE_GLEW)
|
||||
|
||||
SET(projectM_SOURCES projectM.cpp FBO.cpp InitCond.cpp
|
||||
Expr.cpp PCM.cpp Parser.cpp Preset.cpp BeatDetect.cpp PerPixelEqn.cpp Param.cpp CustomWave.cpp CustomShape.cpp
|
||||
Func.cpp Eval.cpp PerFrameEqn.cpp PerPointEqn.cpp fftsg.cpp KeyHandler.cpp
|
||||
timer.cpp wipemalloc.cpp BuiltinFuncs.cpp BuiltinParams.cpp Renderer.cpp
|
||||
PresetLoader.cpp PresetChooser.cpp PresetFrameIO.cpp PresetMerge.cpp
|
||||
ConfigFile.cpp IdlePreset.cpp TextureManager.cpp TimeKeeper.cpp)
|
||||
ConfigFile.cpp IdlePreset.cpp TextureManager.cpp TimeKeeper.cpp ${GLEW_SOURCES})
|
||||
|
||||
if (USE_DEVIL)
|
||||
SET (projectM_SOURCES ${projectM_SOURCES})
|
||||
@ -101,9 +111,9 @@ INCLUDE_DIRECTORIES(${FTGL_INCLUDE_DIRS})
|
||||
LINK_DIRECTORIES(${FTGL_LINK_DIRS} "./")
|
||||
|
||||
if(BUILD_PROJECTM_STATIC)
|
||||
TARGET_LINK_LIBRARIES(projectM GLEW m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS})
|
||||
TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS})
|
||||
else(BUILD_PROJECTM_STATIC)
|
||||
TARGET_LINK_LIBRARIES(projectM GLEW m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS})
|
||||
TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS})
|
||||
endif(BUILD_PROJECTM_STATIC)
|
||||
|
||||
|
||||
|
||||
10835
src/projectM-engine/glew.c
Normal file
10835
src/projectM-engine/glew.c
Normal file
File diff suppressed because it is too large
Load Diff
10783
src/projectM-engine/glew.h
Normal file
10783
src/projectM-engine/glew.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -973,9 +973,6 @@ void QProjectM_MainWindow::hotkeyReference()
|
||||
tr ( "<dl><dt><b>CTRL-L</b></dt> <dd>Locks / unlocks the active preset</dd><dt><b>CTRL-N</b></dt> <dd>Moves to next preset in the playlist </dd><dt><dt><b>CTRL-P</b></dt> <dd>Moves to previous preset in the playlist </dd><dt><b>CTRL-R</b></dt> <dd>Randomly selects a preset from the playlist </dd><dt><b>CTRL-M</b></dt><dd>Show / hide the menu display</dd><dt><b>CTRL-E</b></dt> <dd> Opens the preset editor with the active preset</dd><dt><b>CTRL-F</b></dt> <dd> Enables / disables full screen mode</dd><dt><b>CTRL-Y</b></dt><dd>Enables / disables shuffle mode </dd><dt><b>CTRL-S</b></dt> <dd>Saves and applies changes to the active preset (only when editing) </dd><dt><b>CTRL-B</b></dt><dd>Shows / hides menu and status bar</dd></dl>" ));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void QProjectM_MainWindow::openSettingsDialog() {
|
||||
|
||||
if (configDialog->exec()) {
|
||||
|
||||
Reference in New Issue
Block a user