From cdba68a761abec01c5e3d61b7b454818b0bcf022 Mon Sep 17 00:00:00 2001 From: psperl Date: Tue, 22 Jul 2008 01:08:53 +0000 Subject: [PATCH] renamed projectM-engin libprojectM git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1116 6778bc44-b910-0410-a7a0-be141de4315d --- src/CMakeLists.txt | 2 +- src/{projectM-engine => libprojectM}/Algorithms.hpp | 0 src/{projectM-engine => libprojectM}/BeatDetect.cpp | 0 src/{projectM-engine => libprojectM}/BeatDetect.hpp | 0 .../BuiltinFuncs.cpp | 0 .../BuiltinFuncs.hpp | 0 .../BuiltinParams.cpp | 0 .../BuiltinParams.hpp | 0 src/{projectM-engine => libprojectM}/CMakeLists.txt | 0 src/{projectM-engine => libprojectM}/CValue.hpp | 0 src/{projectM-engine => libprojectM}/ChangeLog | 0 src/{projectM-engine => libprojectM}/Common.hpp | 0 src/{projectM-engine => libprojectM}/ConfigFile.cpp | 0 src/{projectM-engine => libprojectM}/ConfigFile.h | 0 .../CustomShape.cpp | 0 .../CustomShape.hpp | 0 src/{projectM-engine => libprojectM}/CustomWave.cpp | 0 src/{projectM-engine => libprojectM}/CustomWave.hpp | 0 src/{projectM-engine => libprojectM}/Eval.cpp | 0 src/{projectM-engine => libprojectM}/Eval.hpp | 0 src/{projectM-engine => libprojectM}/Expr.cpp | 0 src/{projectM-engine => libprojectM}/Expr.hpp | 0 src/{projectM-engine => libprojectM}/FBO.cpp | 0 src/{projectM-engine => libprojectM}/FBO.hpp | 0 src/{projectM-engine => libprojectM}/Filters.cpp | 0 src/{projectM-engine => libprojectM}/Filters.hpp | 0 .../FindPkgConfig.cmake | 0 src/{projectM-engine => libprojectM}/Func.cpp | 0 src/{projectM-engine => libprojectM}/Func.hpp | 0 src/{projectM-engine => libprojectM}/IdlePreset.cpp | 0 src/{projectM-engine => libprojectM}/IdlePreset.hpp | 0 .../IdleTextures.hpp | 0 src/{projectM-engine => libprojectM}/InitCond.cpp | 0 src/{projectM-engine => libprojectM}/InitCond.hpp | 0 .../InitCondUtils.hpp | 0 src/{projectM-engine => libprojectM}/KeyHandler.cpp | 0 src/{projectM-engine => libprojectM}/KeyHandler.hpp | 0 .../MilkdropCompatability.hpp | 0 .../MilkdropWaveform.cpp | 0 .../MilkdropWaveform.hpp | 0 .../MstressJuppyDancer.hpp | 0 src/{projectM-engine => libprojectM}/PCM.cpp | 0 src/{projectM-engine => libprojectM}/PCM.hpp | 0 src/{projectM-engine => libprojectM}/Param.cpp | 0 src/{projectM-engine => libprojectM}/Param.hpp | 0 src/{projectM-engine => libprojectM}/ParamUtils.hpp | 0 src/{projectM-engine => libprojectM}/Parser.cpp | 0 src/{projectM-engine => libprojectM}/Parser.hpp | 0 .../PerFrameEqn.cpp | 0 .../PerFrameEqn.hpp | 0 .../PerPixelEqn.cpp | 0 .../PerPixelEqn.hpp | 0 .../PerPixelMesh.cpp | 0 .../PerPixelMesh.hpp | 0 .../PerPointEqn.cpp | 0 .../PerPointEqn.hpp | 0 .../PerlinNoise.cpp | 0 .../PerlinNoise.hpp | 0 src/{projectM-engine => libprojectM}/Pipeline.cpp | 0 src/{projectM-engine => libprojectM}/Pipeline.hpp | 0 .../PipelineContext.cpp | 0 .../PipelineContext.hpp | 0 src/{projectM-engine => libprojectM}/Preset.cpp | 0 src/{projectM-engine => libprojectM}/Preset.hpp | 0 .../PresetChooser.cpp | 0 .../PresetChooser.hpp | 0 .../PresetFrameIO.cpp | 0 .../PresetFrameIO.hpp | 0 .../PresetLoader.cpp | 0 .../PresetLoader.hpp | 0 .../PresetMerge.cpp | 0 .../PresetMerge.hpp | 0 .../RLGFractalDrop7c.hpp | 0 .../RandomNumberGenerators.hpp | 0 src/{projectM-engine => libprojectM}/Renderable.cpp | 0 src/{projectM-engine => libprojectM}/Renderable.hpp | 0 src/{projectM-engine => libprojectM}/Renderer.cpp | 0 src/{projectM-engine => libprojectM}/Renderer.hpp | 0 src/{projectM-engine => libprojectM}/RingBuffer.hpp | 0 .../RovastarDarkSecret.hpp | 0 .../RovastarDriftingChaos.hpp | 0 .../RovastarFractalSpiral.hpp | 0 .../RovastarFractopiaFrantic.hpp | 0 src/{projectM-engine => libprojectM}/SOIL.c | 0 src/{projectM-engine => libprojectM}/SOIL.h | 0 src/{projectM-engine => libprojectM}/Shader.cpp | 0 src/{projectM-engine => libprojectM}/Shader.hpp | 0 .../ShaderEngine.cpp | 0 .../ShaderEngine.hpp | 0 .../TextureManager.cpp | 0 .../TextureManager.hpp | 0 src/{projectM-engine => libprojectM}/TimeKeeper.cpp | 0 src/{projectM-engine => libprojectM}/TimeKeeper.hpp | 0 .../Transformation.hpp | 0 .../UserTexture.cpp | 0 .../UserTexture.hpp | 0 src/{projectM-engine => libprojectM}/VideoEcho.cpp | 0 src/{projectM-engine => libprojectM}/VideoEcho.hpp | 0 src/{projectM-engine => libprojectM}/Waveform.cpp | 0 src/{projectM-engine => libprojectM}/Waveform.hpp | 0 src/{projectM-engine => libprojectM}/blur.cg | 0 .../carbontoprojectM.h | 0 src/{projectM-engine => libprojectM}/compare.h | 0 src/{projectM-engine => libprojectM}/config.inp.in | 0 src/{projectM-engine => libprojectM}/dlldefs.h | 0 src/{projectM-engine => libprojectM}/event.h | 0 src/{projectM-engine => libprojectM}/fatal.h | 0 src/{projectM-engine => libprojectM}/fftsg.cpp | 0 src/{projectM-engine => libprojectM}/fftsg.h | 0 src/{projectM-engine => libprojectM}/fonts | 0 src/{projectM-engine => libprojectM}/glError.h | 0 src/{projectM-engine => libprojectM}/glew.c | 0 src/{projectM-engine => libprojectM}/glew.h | 0 src/{projectM-engine => libprojectM}/glxew.h | 0 src/{projectM-engine => libprojectM}/image_DXT.c | 0 src/{projectM-engine => libprojectM}/image_DXT.h | 0 src/{projectM-engine => libprojectM}/image_helper.c | 0 src/{projectM-engine => libprojectM}/image_helper.h | 0 .../libprojectM.dsp | 0 .../libprojectM.opt | Bin .../libprojectM.pc.in | 0 .../libprojectM.plg | 0 src/{projectM-engine => libprojectM}/libprojectM.rc | 0 .../libprojectM.sln | 0 .../libprojectM.suo | Bin .../libprojectM.vcproj | 0 src/{projectM-engine => libprojectM}/lvtoprojectM.h | 0 .../omptl/Example.cpp | 0 .../omptl/License.txt | 0 src/{projectM-engine => libprojectM}/omptl/omptl | 0 .../omptl/omptl_algorithm | 0 .../omptl/omptl_algorithm_par.h | 0 .../omptl/omptl_algorithm_ser.h | 0 .../omptl/omptl_numeric | 0 .../omptl/omptl_numeric_extentions.h | 0 .../omptl/omptl_numeric_extentions_par.h | 0 .../omptl/omptl_numeric_extentions_ser.h | 0 .../omptl/omptl_numeric_par.h | 0 .../omptl/omptl_numeric_ser.h | 0 .../omptl/omptl_tools.h | 0 src/{projectM-engine => libprojectM}/presets | 0 src/{projectM-engine => libprojectM}/projectM.cg | 0 src/{projectM-engine => libprojectM}/projectM.cpp | 0 src/{projectM-engine => libprojectM}/projectM.dsp | 0 src/{projectM-engine => libprojectM}/projectM.hpp | 0 src/{projectM-engine => libprojectM}/resource.h | 0 .../sdltoprojectM.h | 0 .../stb_image_aug.c | 0 .../stb_image_aug.h | 0 src/{projectM-engine => libprojectM}/stbi_DDS_aug.h | 0 .../stbi_DDS_aug_c.h | 0 src/{projectM-engine => libprojectM}/timer.cpp | 0 src/{projectM-engine => libprojectM}/timer.h | 0 .../win32-dirent.cpp | 0 src/{projectM-engine => libprojectM}/win32-dirent.h | 0 src/{projectM-engine => libprojectM}/wipemalloc.cpp | 0 src/{projectM-engine => libprojectM}/wipemalloc.h | 0 src/projectM-jack/CMakeLists.txt | 4 ++-- src/projectM-libvisual/CMakeLists.txt | 4 ++-- src/projectM-pulseaudio/CMakeLists.txt | 4 ++-- src/projectM-qt/CMakeLists.txt | 4 ++-- src/projectM-test/CMakeLists.txt | 2 +- src/projectM-xmms/CMakeLists.txt | 4 ++-- 163 files changed, 12 insertions(+), 12 deletions(-) rename src/{projectM-engine => libprojectM}/Algorithms.hpp (100%) rename src/{projectM-engine => libprojectM}/BeatDetect.cpp (100%) rename src/{projectM-engine => libprojectM}/BeatDetect.hpp (100%) rename src/{projectM-engine => libprojectM}/BuiltinFuncs.cpp (100%) rename src/{projectM-engine => libprojectM}/BuiltinFuncs.hpp (100%) rename src/{projectM-engine => libprojectM}/BuiltinParams.cpp (100%) rename src/{projectM-engine => libprojectM}/BuiltinParams.hpp (100%) rename src/{projectM-engine => libprojectM}/CMakeLists.txt (100%) rename src/{projectM-engine => libprojectM}/CValue.hpp (100%) rename src/{projectM-engine => libprojectM}/ChangeLog (100%) rename src/{projectM-engine => libprojectM}/Common.hpp (100%) rename src/{projectM-engine => libprojectM}/ConfigFile.cpp (100%) rename src/{projectM-engine => libprojectM}/ConfigFile.h (100%) rename src/{projectM-engine => libprojectM}/CustomShape.cpp (100%) rename src/{projectM-engine => libprojectM}/CustomShape.hpp (100%) rename src/{projectM-engine => libprojectM}/CustomWave.cpp (100%) rename src/{projectM-engine => libprojectM}/CustomWave.hpp (100%) rename src/{projectM-engine => libprojectM}/Eval.cpp (100%) rename src/{projectM-engine => libprojectM}/Eval.hpp (100%) rename src/{projectM-engine => libprojectM}/Expr.cpp (100%) rename src/{projectM-engine => libprojectM}/Expr.hpp (100%) rename src/{projectM-engine => libprojectM}/FBO.cpp (100%) rename src/{projectM-engine => libprojectM}/FBO.hpp (100%) rename src/{projectM-engine => libprojectM}/Filters.cpp (100%) rename src/{projectM-engine => libprojectM}/Filters.hpp (100%) rename src/{projectM-engine => libprojectM}/FindPkgConfig.cmake (100%) rename src/{projectM-engine => libprojectM}/Func.cpp (100%) rename src/{projectM-engine => libprojectM}/Func.hpp (100%) rename src/{projectM-engine => libprojectM}/IdlePreset.cpp (100%) rename src/{projectM-engine => libprojectM}/IdlePreset.hpp (100%) rename src/{projectM-engine => libprojectM}/IdleTextures.hpp (100%) rename src/{projectM-engine => libprojectM}/InitCond.cpp (100%) rename src/{projectM-engine => libprojectM}/InitCond.hpp (100%) rename src/{projectM-engine => libprojectM}/InitCondUtils.hpp (100%) rename src/{projectM-engine => libprojectM}/KeyHandler.cpp (100%) rename src/{projectM-engine => libprojectM}/KeyHandler.hpp (100%) rename src/{projectM-engine => libprojectM}/MilkdropCompatability.hpp (100%) rename src/{projectM-engine => libprojectM}/MilkdropWaveform.cpp (100%) rename src/{projectM-engine => libprojectM}/MilkdropWaveform.hpp (100%) rename src/{projectM-engine => libprojectM}/MstressJuppyDancer.hpp (100%) rename src/{projectM-engine => libprojectM}/PCM.cpp (100%) rename src/{projectM-engine => libprojectM}/PCM.hpp (100%) rename src/{projectM-engine => libprojectM}/Param.cpp (100%) rename src/{projectM-engine => libprojectM}/Param.hpp (100%) rename src/{projectM-engine => libprojectM}/ParamUtils.hpp (100%) rename src/{projectM-engine => libprojectM}/Parser.cpp (100%) rename src/{projectM-engine => libprojectM}/Parser.hpp (100%) rename src/{projectM-engine => libprojectM}/PerFrameEqn.cpp (100%) rename src/{projectM-engine => libprojectM}/PerFrameEqn.hpp (100%) rename src/{projectM-engine => libprojectM}/PerPixelEqn.cpp (100%) rename src/{projectM-engine => libprojectM}/PerPixelEqn.hpp (100%) rename src/{projectM-engine => libprojectM}/PerPixelMesh.cpp (100%) rename src/{projectM-engine => libprojectM}/PerPixelMesh.hpp (100%) rename src/{projectM-engine => libprojectM}/PerPointEqn.cpp (100%) rename src/{projectM-engine => libprojectM}/PerPointEqn.hpp (100%) rename src/{projectM-engine => libprojectM}/PerlinNoise.cpp (100%) rename src/{projectM-engine => libprojectM}/PerlinNoise.hpp (100%) rename src/{projectM-engine => libprojectM}/Pipeline.cpp (100%) rename src/{projectM-engine => libprojectM}/Pipeline.hpp (100%) rename src/{projectM-engine => libprojectM}/PipelineContext.cpp (100%) rename src/{projectM-engine => libprojectM}/PipelineContext.hpp (100%) rename src/{projectM-engine => libprojectM}/Preset.cpp (100%) rename src/{projectM-engine => libprojectM}/Preset.hpp (100%) rename src/{projectM-engine => libprojectM}/PresetChooser.cpp (100%) rename src/{projectM-engine => libprojectM}/PresetChooser.hpp (100%) rename src/{projectM-engine => libprojectM}/PresetFrameIO.cpp (100%) rename src/{projectM-engine => libprojectM}/PresetFrameIO.hpp (100%) rename src/{projectM-engine => libprojectM}/PresetLoader.cpp (100%) rename src/{projectM-engine => libprojectM}/PresetLoader.hpp (100%) rename src/{projectM-engine => libprojectM}/PresetMerge.cpp (100%) rename src/{projectM-engine => libprojectM}/PresetMerge.hpp (100%) rename src/{projectM-engine => libprojectM}/RLGFractalDrop7c.hpp (100%) rename src/{projectM-engine => libprojectM}/RandomNumberGenerators.hpp (100%) rename src/{projectM-engine => libprojectM}/Renderable.cpp (100%) rename src/{projectM-engine => libprojectM}/Renderable.hpp (100%) rename src/{projectM-engine => libprojectM}/Renderer.cpp (100%) rename src/{projectM-engine => libprojectM}/Renderer.hpp (100%) rename src/{projectM-engine => libprojectM}/RingBuffer.hpp (100%) rename src/{projectM-engine => libprojectM}/RovastarDarkSecret.hpp (100%) rename src/{projectM-engine => libprojectM}/RovastarDriftingChaos.hpp (100%) rename src/{projectM-engine => libprojectM}/RovastarFractalSpiral.hpp (100%) rename src/{projectM-engine => libprojectM}/RovastarFractopiaFrantic.hpp (100%) rename src/{projectM-engine => libprojectM}/SOIL.c (100%) rename src/{projectM-engine => libprojectM}/SOIL.h (100%) rename src/{projectM-engine => libprojectM}/Shader.cpp (100%) rename src/{projectM-engine => libprojectM}/Shader.hpp (100%) rename src/{projectM-engine => libprojectM}/ShaderEngine.cpp (100%) rename src/{projectM-engine => libprojectM}/ShaderEngine.hpp (100%) rename src/{projectM-engine => libprojectM}/TextureManager.cpp (100%) rename src/{projectM-engine => libprojectM}/TextureManager.hpp (100%) rename src/{projectM-engine => libprojectM}/TimeKeeper.cpp (100%) rename src/{projectM-engine => libprojectM}/TimeKeeper.hpp (100%) rename src/{projectM-engine => libprojectM}/Transformation.hpp (100%) rename src/{projectM-engine => libprojectM}/UserTexture.cpp (100%) rename src/{projectM-engine => libprojectM}/UserTexture.hpp (100%) rename src/{projectM-engine => libprojectM}/VideoEcho.cpp (100%) rename src/{projectM-engine => libprojectM}/VideoEcho.hpp (100%) rename src/{projectM-engine => libprojectM}/Waveform.cpp (100%) rename src/{projectM-engine => libprojectM}/Waveform.hpp (100%) rename src/{projectM-engine => libprojectM}/blur.cg (100%) rename src/{projectM-engine => libprojectM}/carbontoprojectM.h (100%) rename src/{projectM-engine => libprojectM}/compare.h (100%) rename src/{projectM-engine => libprojectM}/config.inp.in (100%) rename src/{projectM-engine => libprojectM}/dlldefs.h (100%) rename src/{projectM-engine => libprojectM}/event.h (100%) rename src/{projectM-engine => libprojectM}/fatal.h (100%) rename src/{projectM-engine => libprojectM}/fftsg.cpp (100%) rename src/{projectM-engine => libprojectM}/fftsg.h (100%) rename src/{projectM-engine => libprojectM}/fonts (100%) rename src/{projectM-engine => libprojectM}/glError.h (100%) rename src/{projectM-engine => libprojectM}/glew.c (100%) rename src/{projectM-engine => libprojectM}/glew.h (100%) rename src/{projectM-engine => libprojectM}/glxew.h (100%) rename src/{projectM-engine => libprojectM}/image_DXT.c (100%) rename src/{projectM-engine => libprojectM}/image_DXT.h (100%) rename src/{projectM-engine => libprojectM}/image_helper.c (100%) rename src/{projectM-engine => libprojectM}/image_helper.h (100%) rename src/{projectM-engine => libprojectM}/libprojectM.dsp (100%) rename src/{projectM-engine => libprojectM}/libprojectM.opt (100%) rename src/{projectM-engine => libprojectM}/libprojectM.pc.in (100%) rename src/{projectM-engine => libprojectM}/libprojectM.plg (100%) rename src/{projectM-engine => libprojectM}/libprojectM.rc (100%) rename src/{projectM-engine => libprojectM}/libprojectM.sln (100%) rename src/{projectM-engine => libprojectM}/libprojectM.suo (100%) rename src/{projectM-engine => libprojectM}/libprojectM.vcproj (100%) rename src/{projectM-engine => libprojectM}/lvtoprojectM.h (100%) rename src/{projectM-engine => libprojectM}/omptl/Example.cpp (100%) rename src/{projectM-engine => libprojectM}/omptl/License.txt (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_algorithm (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_algorithm_par.h (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_algorithm_ser.h (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_numeric (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_numeric_extentions.h (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_numeric_extentions_par.h (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_numeric_extentions_ser.h (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_numeric_par.h (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_numeric_ser.h (100%) rename src/{projectM-engine => libprojectM}/omptl/omptl_tools.h (100%) rename src/{projectM-engine => libprojectM}/presets (100%) rename src/{projectM-engine => libprojectM}/projectM.cg (100%) rename src/{projectM-engine => libprojectM}/projectM.cpp (100%) rename src/{projectM-engine => libprojectM}/projectM.dsp (100%) rename src/{projectM-engine => libprojectM}/projectM.hpp (100%) rename src/{projectM-engine => libprojectM}/resource.h (100%) rename src/{projectM-engine => libprojectM}/sdltoprojectM.h (100%) rename src/{projectM-engine => libprojectM}/stb_image_aug.c (100%) rename src/{projectM-engine => libprojectM}/stb_image_aug.h (100%) rename src/{projectM-engine => libprojectM}/stbi_DDS_aug.h (100%) rename src/{projectM-engine => libprojectM}/stbi_DDS_aug_c.h (100%) rename src/{projectM-engine => libprojectM}/timer.cpp (100%) rename src/{projectM-engine => libprojectM}/timer.h (100%) rename src/{projectM-engine => libprojectM}/win32-dirent.cpp (100%) rename src/{projectM-engine => libprojectM}/win32-dirent.h (100%) rename src/{projectM-engine => libprojectM}/wipemalloc.cpp (100%) rename src/{projectM-engine => libprojectM}/wipemalloc.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc4758707..8136109ea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ OPTION(INCLUDE-PROJECTM-JACK "Build the projectM JACK client" OFF) OPTION(INCLUDE-PROJECTM-TEST "Build the projectM test suite" ON) OPTION(INCLUDE-PROJECTM-XMMS "Build the projectM xmms module (deprecated, use audacious instead)" OFF) -add_subdirectory (projectM-engine) +add_subdirectory (libprojectM) if(INCLUDE-PROJECTM-TEST) add_subdirectory (projectM-test) diff --git a/src/projectM-engine/Algorithms.hpp b/src/libprojectM/Algorithms.hpp similarity index 100% rename from src/projectM-engine/Algorithms.hpp rename to src/libprojectM/Algorithms.hpp diff --git a/src/projectM-engine/BeatDetect.cpp b/src/libprojectM/BeatDetect.cpp similarity index 100% rename from src/projectM-engine/BeatDetect.cpp rename to src/libprojectM/BeatDetect.cpp diff --git a/src/projectM-engine/BeatDetect.hpp b/src/libprojectM/BeatDetect.hpp similarity index 100% rename from src/projectM-engine/BeatDetect.hpp rename to src/libprojectM/BeatDetect.hpp diff --git a/src/projectM-engine/BuiltinFuncs.cpp b/src/libprojectM/BuiltinFuncs.cpp similarity index 100% rename from src/projectM-engine/BuiltinFuncs.cpp rename to src/libprojectM/BuiltinFuncs.cpp diff --git a/src/projectM-engine/BuiltinFuncs.hpp b/src/libprojectM/BuiltinFuncs.hpp similarity index 100% rename from src/projectM-engine/BuiltinFuncs.hpp rename to src/libprojectM/BuiltinFuncs.hpp diff --git a/src/projectM-engine/BuiltinParams.cpp b/src/libprojectM/BuiltinParams.cpp similarity index 100% rename from src/projectM-engine/BuiltinParams.cpp rename to src/libprojectM/BuiltinParams.cpp diff --git a/src/projectM-engine/BuiltinParams.hpp b/src/libprojectM/BuiltinParams.hpp similarity index 100% rename from src/projectM-engine/BuiltinParams.hpp rename to src/libprojectM/BuiltinParams.hpp diff --git a/src/projectM-engine/CMakeLists.txt b/src/libprojectM/CMakeLists.txt similarity index 100% rename from src/projectM-engine/CMakeLists.txt rename to src/libprojectM/CMakeLists.txt diff --git a/src/projectM-engine/CValue.hpp b/src/libprojectM/CValue.hpp similarity index 100% rename from src/projectM-engine/CValue.hpp rename to src/libprojectM/CValue.hpp diff --git a/src/projectM-engine/ChangeLog b/src/libprojectM/ChangeLog similarity index 100% rename from src/projectM-engine/ChangeLog rename to src/libprojectM/ChangeLog diff --git a/src/projectM-engine/Common.hpp b/src/libprojectM/Common.hpp similarity index 100% rename from src/projectM-engine/Common.hpp rename to src/libprojectM/Common.hpp diff --git a/src/projectM-engine/ConfigFile.cpp b/src/libprojectM/ConfigFile.cpp similarity index 100% rename from src/projectM-engine/ConfigFile.cpp rename to src/libprojectM/ConfigFile.cpp diff --git a/src/projectM-engine/ConfigFile.h b/src/libprojectM/ConfigFile.h similarity index 100% rename from src/projectM-engine/ConfigFile.h rename to src/libprojectM/ConfigFile.h diff --git a/src/projectM-engine/CustomShape.cpp b/src/libprojectM/CustomShape.cpp similarity index 100% rename from src/projectM-engine/CustomShape.cpp rename to src/libprojectM/CustomShape.cpp diff --git a/src/projectM-engine/CustomShape.hpp b/src/libprojectM/CustomShape.hpp similarity index 100% rename from src/projectM-engine/CustomShape.hpp rename to src/libprojectM/CustomShape.hpp diff --git a/src/projectM-engine/CustomWave.cpp b/src/libprojectM/CustomWave.cpp similarity index 100% rename from src/projectM-engine/CustomWave.cpp rename to src/libprojectM/CustomWave.cpp diff --git a/src/projectM-engine/CustomWave.hpp b/src/libprojectM/CustomWave.hpp similarity index 100% rename from src/projectM-engine/CustomWave.hpp rename to src/libprojectM/CustomWave.hpp diff --git a/src/projectM-engine/Eval.cpp b/src/libprojectM/Eval.cpp similarity index 100% rename from src/projectM-engine/Eval.cpp rename to src/libprojectM/Eval.cpp diff --git a/src/projectM-engine/Eval.hpp b/src/libprojectM/Eval.hpp similarity index 100% rename from src/projectM-engine/Eval.hpp rename to src/libprojectM/Eval.hpp diff --git a/src/projectM-engine/Expr.cpp b/src/libprojectM/Expr.cpp similarity index 100% rename from src/projectM-engine/Expr.cpp rename to src/libprojectM/Expr.cpp diff --git a/src/projectM-engine/Expr.hpp b/src/libprojectM/Expr.hpp similarity index 100% rename from src/projectM-engine/Expr.hpp rename to src/libprojectM/Expr.hpp diff --git a/src/projectM-engine/FBO.cpp b/src/libprojectM/FBO.cpp similarity index 100% rename from src/projectM-engine/FBO.cpp rename to src/libprojectM/FBO.cpp diff --git a/src/projectM-engine/FBO.hpp b/src/libprojectM/FBO.hpp similarity index 100% rename from src/projectM-engine/FBO.hpp rename to src/libprojectM/FBO.hpp diff --git a/src/projectM-engine/Filters.cpp b/src/libprojectM/Filters.cpp similarity index 100% rename from src/projectM-engine/Filters.cpp rename to src/libprojectM/Filters.cpp diff --git a/src/projectM-engine/Filters.hpp b/src/libprojectM/Filters.hpp similarity index 100% rename from src/projectM-engine/Filters.hpp rename to src/libprojectM/Filters.hpp diff --git a/src/projectM-engine/FindPkgConfig.cmake b/src/libprojectM/FindPkgConfig.cmake similarity index 100% rename from src/projectM-engine/FindPkgConfig.cmake rename to src/libprojectM/FindPkgConfig.cmake diff --git a/src/projectM-engine/Func.cpp b/src/libprojectM/Func.cpp similarity index 100% rename from src/projectM-engine/Func.cpp rename to src/libprojectM/Func.cpp diff --git a/src/projectM-engine/Func.hpp b/src/libprojectM/Func.hpp similarity index 100% rename from src/projectM-engine/Func.hpp rename to src/libprojectM/Func.hpp diff --git a/src/projectM-engine/IdlePreset.cpp b/src/libprojectM/IdlePreset.cpp similarity index 100% rename from src/projectM-engine/IdlePreset.cpp rename to src/libprojectM/IdlePreset.cpp diff --git a/src/projectM-engine/IdlePreset.hpp b/src/libprojectM/IdlePreset.hpp similarity index 100% rename from src/projectM-engine/IdlePreset.hpp rename to src/libprojectM/IdlePreset.hpp diff --git a/src/projectM-engine/IdleTextures.hpp b/src/libprojectM/IdleTextures.hpp similarity index 100% rename from src/projectM-engine/IdleTextures.hpp rename to src/libprojectM/IdleTextures.hpp diff --git a/src/projectM-engine/InitCond.cpp b/src/libprojectM/InitCond.cpp similarity index 100% rename from src/projectM-engine/InitCond.cpp rename to src/libprojectM/InitCond.cpp diff --git a/src/projectM-engine/InitCond.hpp b/src/libprojectM/InitCond.hpp similarity index 100% rename from src/projectM-engine/InitCond.hpp rename to src/libprojectM/InitCond.hpp diff --git a/src/projectM-engine/InitCondUtils.hpp b/src/libprojectM/InitCondUtils.hpp similarity index 100% rename from src/projectM-engine/InitCondUtils.hpp rename to src/libprojectM/InitCondUtils.hpp diff --git a/src/projectM-engine/KeyHandler.cpp b/src/libprojectM/KeyHandler.cpp similarity index 100% rename from src/projectM-engine/KeyHandler.cpp rename to src/libprojectM/KeyHandler.cpp diff --git a/src/projectM-engine/KeyHandler.hpp b/src/libprojectM/KeyHandler.hpp similarity index 100% rename from src/projectM-engine/KeyHandler.hpp rename to src/libprojectM/KeyHandler.hpp diff --git a/src/projectM-engine/MilkdropCompatability.hpp b/src/libprojectM/MilkdropCompatability.hpp similarity index 100% rename from src/projectM-engine/MilkdropCompatability.hpp rename to src/libprojectM/MilkdropCompatability.hpp diff --git a/src/projectM-engine/MilkdropWaveform.cpp b/src/libprojectM/MilkdropWaveform.cpp similarity index 100% rename from src/projectM-engine/MilkdropWaveform.cpp rename to src/libprojectM/MilkdropWaveform.cpp diff --git a/src/projectM-engine/MilkdropWaveform.hpp b/src/libprojectM/MilkdropWaveform.hpp similarity index 100% rename from src/projectM-engine/MilkdropWaveform.hpp rename to src/libprojectM/MilkdropWaveform.hpp diff --git a/src/projectM-engine/MstressJuppyDancer.hpp b/src/libprojectM/MstressJuppyDancer.hpp similarity index 100% rename from src/projectM-engine/MstressJuppyDancer.hpp rename to src/libprojectM/MstressJuppyDancer.hpp diff --git a/src/projectM-engine/PCM.cpp b/src/libprojectM/PCM.cpp similarity index 100% rename from src/projectM-engine/PCM.cpp rename to src/libprojectM/PCM.cpp diff --git a/src/projectM-engine/PCM.hpp b/src/libprojectM/PCM.hpp similarity index 100% rename from src/projectM-engine/PCM.hpp rename to src/libprojectM/PCM.hpp diff --git a/src/projectM-engine/Param.cpp b/src/libprojectM/Param.cpp similarity index 100% rename from src/projectM-engine/Param.cpp rename to src/libprojectM/Param.cpp diff --git a/src/projectM-engine/Param.hpp b/src/libprojectM/Param.hpp similarity index 100% rename from src/projectM-engine/Param.hpp rename to src/libprojectM/Param.hpp diff --git a/src/projectM-engine/ParamUtils.hpp b/src/libprojectM/ParamUtils.hpp similarity index 100% rename from src/projectM-engine/ParamUtils.hpp rename to src/libprojectM/ParamUtils.hpp diff --git a/src/projectM-engine/Parser.cpp b/src/libprojectM/Parser.cpp similarity index 100% rename from src/projectM-engine/Parser.cpp rename to src/libprojectM/Parser.cpp diff --git a/src/projectM-engine/Parser.hpp b/src/libprojectM/Parser.hpp similarity index 100% rename from src/projectM-engine/Parser.hpp rename to src/libprojectM/Parser.hpp diff --git a/src/projectM-engine/PerFrameEqn.cpp b/src/libprojectM/PerFrameEqn.cpp similarity index 100% rename from src/projectM-engine/PerFrameEqn.cpp rename to src/libprojectM/PerFrameEqn.cpp diff --git a/src/projectM-engine/PerFrameEqn.hpp b/src/libprojectM/PerFrameEqn.hpp similarity index 100% rename from src/projectM-engine/PerFrameEqn.hpp rename to src/libprojectM/PerFrameEqn.hpp diff --git a/src/projectM-engine/PerPixelEqn.cpp b/src/libprojectM/PerPixelEqn.cpp similarity index 100% rename from src/projectM-engine/PerPixelEqn.cpp rename to src/libprojectM/PerPixelEqn.cpp diff --git a/src/projectM-engine/PerPixelEqn.hpp b/src/libprojectM/PerPixelEqn.hpp similarity index 100% rename from src/projectM-engine/PerPixelEqn.hpp rename to src/libprojectM/PerPixelEqn.hpp diff --git a/src/projectM-engine/PerPixelMesh.cpp b/src/libprojectM/PerPixelMesh.cpp similarity index 100% rename from src/projectM-engine/PerPixelMesh.cpp rename to src/libprojectM/PerPixelMesh.cpp diff --git a/src/projectM-engine/PerPixelMesh.hpp b/src/libprojectM/PerPixelMesh.hpp similarity index 100% rename from src/projectM-engine/PerPixelMesh.hpp rename to src/libprojectM/PerPixelMesh.hpp diff --git a/src/projectM-engine/PerPointEqn.cpp b/src/libprojectM/PerPointEqn.cpp similarity index 100% rename from src/projectM-engine/PerPointEqn.cpp rename to src/libprojectM/PerPointEqn.cpp diff --git a/src/projectM-engine/PerPointEqn.hpp b/src/libprojectM/PerPointEqn.hpp similarity index 100% rename from src/projectM-engine/PerPointEqn.hpp rename to src/libprojectM/PerPointEqn.hpp diff --git a/src/projectM-engine/PerlinNoise.cpp b/src/libprojectM/PerlinNoise.cpp similarity index 100% rename from src/projectM-engine/PerlinNoise.cpp rename to src/libprojectM/PerlinNoise.cpp diff --git a/src/projectM-engine/PerlinNoise.hpp b/src/libprojectM/PerlinNoise.hpp similarity index 100% rename from src/projectM-engine/PerlinNoise.hpp rename to src/libprojectM/PerlinNoise.hpp diff --git a/src/projectM-engine/Pipeline.cpp b/src/libprojectM/Pipeline.cpp similarity index 100% rename from src/projectM-engine/Pipeline.cpp rename to src/libprojectM/Pipeline.cpp diff --git a/src/projectM-engine/Pipeline.hpp b/src/libprojectM/Pipeline.hpp similarity index 100% rename from src/projectM-engine/Pipeline.hpp rename to src/libprojectM/Pipeline.hpp diff --git a/src/projectM-engine/PipelineContext.cpp b/src/libprojectM/PipelineContext.cpp similarity index 100% rename from src/projectM-engine/PipelineContext.cpp rename to src/libprojectM/PipelineContext.cpp diff --git a/src/projectM-engine/PipelineContext.hpp b/src/libprojectM/PipelineContext.hpp similarity index 100% rename from src/projectM-engine/PipelineContext.hpp rename to src/libprojectM/PipelineContext.hpp diff --git a/src/projectM-engine/Preset.cpp b/src/libprojectM/Preset.cpp similarity index 100% rename from src/projectM-engine/Preset.cpp rename to src/libprojectM/Preset.cpp diff --git a/src/projectM-engine/Preset.hpp b/src/libprojectM/Preset.hpp similarity index 100% rename from src/projectM-engine/Preset.hpp rename to src/libprojectM/Preset.hpp diff --git a/src/projectM-engine/PresetChooser.cpp b/src/libprojectM/PresetChooser.cpp similarity index 100% rename from src/projectM-engine/PresetChooser.cpp rename to src/libprojectM/PresetChooser.cpp diff --git a/src/projectM-engine/PresetChooser.hpp b/src/libprojectM/PresetChooser.hpp similarity index 100% rename from src/projectM-engine/PresetChooser.hpp rename to src/libprojectM/PresetChooser.hpp diff --git a/src/projectM-engine/PresetFrameIO.cpp b/src/libprojectM/PresetFrameIO.cpp similarity index 100% rename from src/projectM-engine/PresetFrameIO.cpp rename to src/libprojectM/PresetFrameIO.cpp diff --git a/src/projectM-engine/PresetFrameIO.hpp b/src/libprojectM/PresetFrameIO.hpp similarity index 100% rename from src/projectM-engine/PresetFrameIO.hpp rename to src/libprojectM/PresetFrameIO.hpp diff --git a/src/projectM-engine/PresetLoader.cpp b/src/libprojectM/PresetLoader.cpp similarity index 100% rename from src/projectM-engine/PresetLoader.cpp rename to src/libprojectM/PresetLoader.cpp diff --git a/src/projectM-engine/PresetLoader.hpp b/src/libprojectM/PresetLoader.hpp similarity index 100% rename from src/projectM-engine/PresetLoader.hpp rename to src/libprojectM/PresetLoader.hpp diff --git a/src/projectM-engine/PresetMerge.cpp b/src/libprojectM/PresetMerge.cpp similarity index 100% rename from src/projectM-engine/PresetMerge.cpp rename to src/libprojectM/PresetMerge.cpp diff --git a/src/projectM-engine/PresetMerge.hpp b/src/libprojectM/PresetMerge.hpp similarity index 100% rename from src/projectM-engine/PresetMerge.hpp rename to src/libprojectM/PresetMerge.hpp diff --git a/src/projectM-engine/RLGFractalDrop7c.hpp b/src/libprojectM/RLGFractalDrop7c.hpp similarity index 100% rename from src/projectM-engine/RLGFractalDrop7c.hpp rename to src/libprojectM/RLGFractalDrop7c.hpp diff --git a/src/projectM-engine/RandomNumberGenerators.hpp b/src/libprojectM/RandomNumberGenerators.hpp similarity index 100% rename from src/projectM-engine/RandomNumberGenerators.hpp rename to src/libprojectM/RandomNumberGenerators.hpp diff --git a/src/projectM-engine/Renderable.cpp b/src/libprojectM/Renderable.cpp similarity index 100% rename from src/projectM-engine/Renderable.cpp rename to src/libprojectM/Renderable.cpp diff --git a/src/projectM-engine/Renderable.hpp b/src/libprojectM/Renderable.hpp similarity index 100% rename from src/projectM-engine/Renderable.hpp rename to src/libprojectM/Renderable.hpp diff --git a/src/projectM-engine/Renderer.cpp b/src/libprojectM/Renderer.cpp similarity index 100% rename from src/projectM-engine/Renderer.cpp rename to src/libprojectM/Renderer.cpp diff --git a/src/projectM-engine/Renderer.hpp b/src/libprojectM/Renderer.hpp similarity index 100% rename from src/projectM-engine/Renderer.hpp rename to src/libprojectM/Renderer.hpp diff --git a/src/projectM-engine/RingBuffer.hpp b/src/libprojectM/RingBuffer.hpp similarity index 100% rename from src/projectM-engine/RingBuffer.hpp rename to src/libprojectM/RingBuffer.hpp diff --git a/src/projectM-engine/RovastarDarkSecret.hpp b/src/libprojectM/RovastarDarkSecret.hpp similarity index 100% rename from src/projectM-engine/RovastarDarkSecret.hpp rename to src/libprojectM/RovastarDarkSecret.hpp diff --git a/src/projectM-engine/RovastarDriftingChaos.hpp b/src/libprojectM/RovastarDriftingChaos.hpp similarity index 100% rename from src/projectM-engine/RovastarDriftingChaos.hpp rename to src/libprojectM/RovastarDriftingChaos.hpp diff --git a/src/projectM-engine/RovastarFractalSpiral.hpp b/src/libprojectM/RovastarFractalSpiral.hpp similarity index 100% rename from src/projectM-engine/RovastarFractalSpiral.hpp rename to src/libprojectM/RovastarFractalSpiral.hpp diff --git a/src/projectM-engine/RovastarFractopiaFrantic.hpp b/src/libprojectM/RovastarFractopiaFrantic.hpp similarity index 100% rename from src/projectM-engine/RovastarFractopiaFrantic.hpp rename to src/libprojectM/RovastarFractopiaFrantic.hpp diff --git a/src/projectM-engine/SOIL.c b/src/libprojectM/SOIL.c similarity index 100% rename from src/projectM-engine/SOIL.c rename to src/libprojectM/SOIL.c diff --git a/src/projectM-engine/SOIL.h b/src/libprojectM/SOIL.h similarity index 100% rename from src/projectM-engine/SOIL.h rename to src/libprojectM/SOIL.h diff --git a/src/projectM-engine/Shader.cpp b/src/libprojectM/Shader.cpp similarity index 100% rename from src/projectM-engine/Shader.cpp rename to src/libprojectM/Shader.cpp diff --git a/src/projectM-engine/Shader.hpp b/src/libprojectM/Shader.hpp similarity index 100% rename from src/projectM-engine/Shader.hpp rename to src/libprojectM/Shader.hpp diff --git a/src/projectM-engine/ShaderEngine.cpp b/src/libprojectM/ShaderEngine.cpp similarity index 100% rename from src/projectM-engine/ShaderEngine.cpp rename to src/libprojectM/ShaderEngine.cpp diff --git a/src/projectM-engine/ShaderEngine.hpp b/src/libprojectM/ShaderEngine.hpp similarity index 100% rename from src/projectM-engine/ShaderEngine.hpp rename to src/libprojectM/ShaderEngine.hpp diff --git a/src/projectM-engine/TextureManager.cpp b/src/libprojectM/TextureManager.cpp similarity index 100% rename from src/projectM-engine/TextureManager.cpp rename to src/libprojectM/TextureManager.cpp diff --git a/src/projectM-engine/TextureManager.hpp b/src/libprojectM/TextureManager.hpp similarity index 100% rename from src/projectM-engine/TextureManager.hpp rename to src/libprojectM/TextureManager.hpp diff --git a/src/projectM-engine/TimeKeeper.cpp b/src/libprojectM/TimeKeeper.cpp similarity index 100% rename from src/projectM-engine/TimeKeeper.cpp rename to src/libprojectM/TimeKeeper.cpp diff --git a/src/projectM-engine/TimeKeeper.hpp b/src/libprojectM/TimeKeeper.hpp similarity index 100% rename from src/projectM-engine/TimeKeeper.hpp rename to src/libprojectM/TimeKeeper.hpp diff --git a/src/projectM-engine/Transformation.hpp b/src/libprojectM/Transformation.hpp similarity index 100% rename from src/projectM-engine/Transformation.hpp rename to src/libprojectM/Transformation.hpp diff --git a/src/projectM-engine/UserTexture.cpp b/src/libprojectM/UserTexture.cpp similarity index 100% rename from src/projectM-engine/UserTexture.cpp rename to src/libprojectM/UserTexture.cpp diff --git a/src/projectM-engine/UserTexture.hpp b/src/libprojectM/UserTexture.hpp similarity index 100% rename from src/projectM-engine/UserTexture.hpp rename to src/libprojectM/UserTexture.hpp diff --git a/src/projectM-engine/VideoEcho.cpp b/src/libprojectM/VideoEcho.cpp similarity index 100% rename from src/projectM-engine/VideoEcho.cpp rename to src/libprojectM/VideoEcho.cpp diff --git a/src/projectM-engine/VideoEcho.hpp b/src/libprojectM/VideoEcho.hpp similarity index 100% rename from src/projectM-engine/VideoEcho.hpp rename to src/libprojectM/VideoEcho.hpp diff --git a/src/projectM-engine/Waveform.cpp b/src/libprojectM/Waveform.cpp similarity index 100% rename from src/projectM-engine/Waveform.cpp rename to src/libprojectM/Waveform.cpp diff --git a/src/projectM-engine/Waveform.hpp b/src/libprojectM/Waveform.hpp similarity index 100% rename from src/projectM-engine/Waveform.hpp rename to src/libprojectM/Waveform.hpp diff --git a/src/projectM-engine/blur.cg b/src/libprojectM/blur.cg similarity index 100% rename from src/projectM-engine/blur.cg rename to src/libprojectM/blur.cg diff --git a/src/projectM-engine/carbontoprojectM.h b/src/libprojectM/carbontoprojectM.h similarity index 100% rename from src/projectM-engine/carbontoprojectM.h rename to src/libprojectM/carbontoprojectM.h diff --git a/src/projectM-engine/compare.h b/src/libprojectM/compare.h similarity index 100% rename from src/projectM-engine/compare.h rename to src/libprojectM/compare.h diff --git a/src/projectM-engine/config.inp.in b/src/libprojectM/config.inp.in similarity index 100% rename from src/projectM-engine/config.inp.in rename to src/libprojectM/config.inp.in diff --git a/src/projectM-engine/dlldefs.h b/src/libprojectM/dlldefs.h similarity index 100% rename from src/projectM-engine/dlldefs.h rename to src/libprojectM/dlldefs.h diff --git a/src/projectM-engine/event.h b/src/libprojectM/event.h similarity index 100% rename from src/projectM-engine/event.h rename to src/libprojectM/event.h diff --git a/src/projectM-engine/fatal.h b/src/libprojectM/fatal.h similarity index 100% rename from src/projectM-engine/fatal.h rename to src/libprojectM/fatal.h diff --git a/src/projectM-engine/fftsg.cpp b/src/libprojectM/fftsg.cpp similarity index 100% rename from src/projectM-engine/fftsg.cpp rename to src/libprojectM/fftsg.cpp diff --git a/src/projectM-engine/fftsg.h b/src/libprojectM/fftsg.h similarity index 100% rename from src/projectM-engine/fftsg.h rename to src/libprojectM/fftsg.h diff --git a/src/projectM-engine/fonts b/src/libprojectM/fonts similarity index 100% rename from src/projectM-engine/fonts rename to src/libprojectM/fonts diff --git a/src/projectM-engine/glError.h b/src/libprojectM/glError.h similarity index 100% rename from src/projectM-engine/glError.h rename to src/libprojectM/glError.h diff --git a/src/projectM-engine/glew.c b/src/libprojectM/glew.c similarity index 100% rename from src/projectM-engine/glew.c rename to src/libprojectM/glew.c diff --git a/src/projectM-engine/glew.h b/src/libprojectM/glew.h similarity index 100% rename from src/projectM-engine/glew.h rename to src/libprojectM/glew.h diff --git a/src/projectM-engine/glxew.h b/src/libprojectM/glxew.h similarity index 100% rename from src/projectM-engine/glxew.h rename to src/libprojectM/glxew.h diff --git a/src/projectM-engine/image_DXT.c b/src/libprojectM/image_DXT.c similarity index 100% rename from src/projectM-engine/image_DXT.c rename to src/libprojectM/image_DXT.c diff --git a/src/projectM-engine/image_DXT.h b/src/libprojectM/image_DXT.h similarity index 100% rename from src/projectM-engine/image_DXT.h rename to src/libprojectM/image_DXT.h diff --git a/src/projectM-engine/image_helper.c b/src/libprojectM/image_helper.c similarity index 100% rename from src/projectM-engine/image_helper.c rename to src/libprojectM/image_helper.c diff --git a/src/projectM-engine/image_helper.h b/src/libprojectM/image_helper.h similarity index 100% rename from src/projectM-engine/image_helper.h rename to src/libprojectM/image_helper.h diff --git a/src/projectM-engine/libprojectM.dsp b/src/libprojectM/libprojectM.dsp similarity index 100% rename from src/projectM-engine/libprojectM.dsp rename to src/libprojectM/libprojectM.dsp diff --git a/src/projectM-engine/libprojectM.opt b/src/libprojectM/libprojectM.opt similarity index 100% rename from src/projectM-engine/libprojectM.opt rename to src/libprojectM/libprojectM.opt diff --git a/src/projectM-engine/libprojectM.pc.in b/src/libprojectM/libprojectM.pc.in similarity index 100% rename from src/projectM-engine/libprojectM.pc.in rename to src/libprojectM/libprojectM.pc.in diff --git a/src/projectM-engine/libprojectM.plg b/src/libprojectM/libprojectM.plg similarity index 100% rename from src/projectM-engine/libprojectM.plg rename to src/libprojectM/libprojectM.plg diff --git a/src/projectM-engine/libprojectM.rc b/src/libprojectM/libprojectM.rc similarity index 100% rename from src/projectM-engine/libprojectM.rc rename to src/libprojectM/libprojectM.rc diff --git a/src/projectM-engine/libprojectM.sln b/src/libprojectM/libprojectM.sln similarity index 100% rename from src/projectM-engine/libprojectM.sln rename to src/libprojectM/libprojectM.sln diff --git a/src/projectM-engine/libprojectM.suo b/src/libprojectM/libprojectM.suo similarity index 100% rename from src/projectM-engine/libprojectM.suo rename to src/libprojectM/libprojectM.suo diff --git a/src/projectM-engine/libprojectM.vcproj b/src/libprojectM/libprojectM.vcproj similarity index 100% rename from src/projectM-engine/libprojectM.vcproj rename to src/libprojectM/libprojectM.vcproj diff --git a/src/projectM-engine/lvtoprojectM.h b/src/libprojectM/lvtoprojectM.h similarity index 100% rename from src/projectM-engine/lvtoprojectM.h rename to src/libprojectM/lvtoprojectM.h diff --git a/src/projectM-engine/omptl/Example.cpp b/src/libprojectM/omptl/Example.cpp similarity index 100% rename from src/projectM-engine/omptl/Example.cpp rename to src/libprojectM/omptl/Example.cpp diff --git a/src/projectM-engine/omptl/License.txt b/src/libprojectM/omptl/License.txt similarity index 100% rename from src/projectM-engine/omptl/License.txt rename to src/libprojectM/omptl/License.txt diff --git a/src/projectM-engine/omptl/omptl b/src/libprojectM/omptl/omptl similarity index 100% rename from src/projectM-engine/omptl/omptl rename to src/libprojectM/omptl/omptl diff --git a/src/projectM-engine/omptl/omptl_algorithm b/src/libprojectM/omptl/omptl_algorithm similarity index 100% rename from src/projectM-engine/omptl/omptl_algorithm rename to src/libprojectM/omptl/omptl_algorithm diff --git a/src/projectM-engine/omptl/omptl_algorithm_par.h b/src/libprojectM/omptl/omptl_algorithm_par.h similarity index 100% rename from src/projectM-engine/omptl/omptl_algorithm_par.h rename to src/libprojectM/omptl/omptl_algorithm_par.h diff --git a/src/projectM-engine/omptl/omptl_algorithm_ser.h b/src/libprojectM/omptl/omptl_algorithm_ser.h similarity index 100% rename from src/projectM-engine/omptl/omptl_algorithm_ser.h rename to src/libprojectM/omptl/omptl_algorithm_ser.h diff --git a/src/projectM-engine/omptl/omptl_numeric b/src/libprojectM/omptl/omptl_numeric similarity index 100% rename from src/projectM-engine/omptl/omptl_numeric rename to src/libprojectM/omptl/omptl_numeric diff --git a/src/projectM-engine/omptl/omptl_numeric_extentions.h b/src/libprojectM/omptl/omptl_numeric_extentions.h similarity index 100% rename from src/projectM-engine/omptl/omptl_numeric_extentions.h rename to src/libprojectM/omptl/omptl_numeric_extentions.h diff --git a/src/projectM-engine/omptl/omptl_numeric_extentions_par.h b/src/libprojectM/omptl/omptl_numeric_extentions_par.h similarity index 100% rename from src/projectM-engine/omptl/omptl_numeric_extentions_par.h rename to src/libprojectM/omptl/omptl_numeric_extentions_par.h diff --git a/src/projectM-engine/omptl/omptl_numeric_extentions_ser.h b/src/libprojectM/omptl/omptl_numeric_extentions_ser.h similarity index 100% rename from src/projectM-engine/omptl/omptl_numeric_extentions_ser.h rename to src/libprojectM/omptl/omptl_numeric_extentions_ser.h diff --git a/src/projectM-engine/omptl/omptl_numeric_par.h b/src/libprojectM/omptl/omptl_numeric_par.h similarity index 100% rename from src/projectM-engine/omptl/omptl_numeric_par.h rename to src/libprojectM/omptl/omptl_numeric_par.h diff --git a/src/projectM-engine/omptl/omptl_numeric_ser.h b/src/libprojectM/omptl/omptl_numeric_ser.h similarity index 100% rename from src/projectM-engine/omptl/omptl_numeric_ser.h rename to src/libprojectM/omptl/omptl_numeric_ser.h diff --git a/src/projectM-engine/omptl/omptl_tools.h b/src/libprojectM/omptl/omptl_tools.h similarity index 100% rename from src/projectM-engine/omptl/omptl_tools.h rename to src/libprojectM/omptl/omptl_tools.h diff --git a/src/projectM-engine/presets b/src/libprojectM/presets similarity index 100% rename from src/projectM-engine/presets rename to src/libprojectM/presets diff --git a/src/projectM-engine/projectM.cg b/src/libprojectM/projectM.cg similarity index 100% rename from src/projectM-engine/projectM.cg rename to src/libprojectM/projectM.cg diff --git a/src/projectM-engine/projectM.cpp b/src/libprojectM/projectM.cpp similarity index 100% rename from src/projectM-engine/projectM.cpp rename to src/libprojectM/projectM.cpp diff --git a/src/projectM-engine/projectM.dsp b/src/libprojectM/projectM.dsp similarity index 100% rename from src/projectM-engine/projectM.dsp rename to src/libprojectM/projectM.dsp diff --git a/src/projectM-engine/projectM.hpp b/src/libprojectM/projectM.hpp similarity index 100% rename from src/projectM-engine/projectM.hpp rename to src/libprojectM/projectM.hpp diff --git a/src/projectM-engine/resource.h b/src/libprojectM/resource.h similarity index 100% rename from src/projectM-engine/resource.h rename to src/libprojectM/resource.h diff --git a/src/projectM-engine/sdltoprojectM.h b/src/libprojectM/sdltoprojectM.h similarity index 100% rename from src/projectM-engine/sdltoprojectM.h rename to src/libprojectM/sdltoprojectM.h diff --git a/src/projectM-engine/stb_image_aug.c b/src/libprojectM/stb_image_aug.c similarity index 100% rename from src/projectM-engine/stb_image_aug.c rename to src/libprojectM/stb_image_aug.c diff --git a/src/projectM-engine/stb_image_aug.h b/src/libprojectM/stb_image_aug.h similarity index 100% rename from src/projectM-engine/stb_image_aug.h rename to src/libprojectM/stb_image_aug.h diff --git a/src/projectM-engine/stbi_DDS_aug.h b/src/libprojectM/stbi_DDS_aug.h similarity index 100% rename from src/projectM-engine/stbi_DDS_aug.h rename to src/libprojectM/stbi_DDS_aug.h diff --git a/src/projectM-engine/stbi_DDS_aug_c.h b/src/libprojectM/stbi_DDS_aug_c.h similarity index 100% rename from src/projectM-engine/stbi_DDS_aug_c.h rename to src/libprojectM/stbi_DDS_aug_c.h diff --git a/src/projectM-engine/timer.cpp b/src/libprojectM/timer.cpp similarity index 100% rename from src/projectM-engine/timer.cpp rename to src/libprojectM/timer.cpp diff --git a/src/projectM-engine/timer.h b/src/libprojectM/timer.h similarity index 100% rename from src/projectM-engine/timer.h rename to src/libprojectM/timer.h diff --git a/src/projectM-engine/win32-dirent.cpp b/src/libprojectM/win32-dirent.cpp similarity index 100% rename from src/projectM-engine/win32-dirent.cpp rename to src/libprojectM/win32-dirent.cpp diff --git a/src/projectM-engine/win32-dirent.h b/src/libprojectM/win32-dirent.h similarity index 100% rename from src/projectM-engine/win32-dirent.h rename to src/libprojectM/win32-dirent.h diff --git a/src/projectM-engine/wipemalloc.cpp b/src/libprojectM/wipemalloc.cpp similarity index 100% rename from src/projectM-engine/wipemalloc.cpp rename to src/libprojectM/wipemalloc.cpp diff --git a/src/projectM-engine/wipemalloc.h b/src/libprojectM/wipemalloc.h similarity index 100% rename from src/projectM-engine/wipemalloc.h rename to src/libprojectM/wipemalloc.h diff --git a/src/projectM-jack/CMakeLists.txt b/src/projectM-jack/CMakeLists.txt index ce9908c53..058492af7 100644 --- a/src/projectM-jack/CMakeLists.txt +++ b/src/projectM-jack/CMakeLists.txt @@ -68,8 +68,8 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG) if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) + set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) + set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM-qt ${LIBPROJECTM-QT_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBPROJECTM-QT_LDFLAGS}) diff --git a/src/projectM-libvisual/CMakeLists.txt b/src/projectM-libvisual/CMakeLists.txt index 7dd311f61..85543d7a7 100644 --- a/src/projectM-libvisual/CMakeLists.txt +++ b/src/projectM-libvisual/CMakeLists.txt @@ -33,8 +33,8 @@ endif(LIBVISUAL_FOUND) if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine) + set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) + set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) diff --git a/src/projectM-pulseaudio/CMakeLists.txt b/src/projectM-pulseaudio/CMakeLists.txt index e7b7513bb..54b91e94d 100644 --- a/src/projectM-pulseaudio/CMakeLists.txt +++ b/src/projectM-pulseaudio/CMakeLists.txt @@ -65,8 +65,8 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG) if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) + set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) + set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM ${LIBPROJECTM-QT_INCLUDEDIR}/libprojectM-qt) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBPROJECTM-QT_LDFLAGS}) diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt index daae5a2b7..3a2016592 100644 --- a/src/projectM-qt/CMakeLists.txt +++ b/src/projectM-qt/CMakeLists.txt @@ -103,8 +103,8 @@ endif(BUILD_PROJECTM_QT_STATIC) SET_TARGET_PROPERTIES(projectM-qt PROPERTIES VERSION 1.10 SOVERSION 1) if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine) + set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) + set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${PROJECTM_LDFLAGS}) diff --git a/src/projectM-test/CMakeLists.txt b/src/projectM-test/CMakeLists.txt index 30c25a31f..df04271fb 100644 --- a/src/projectM-test/CMakeLists.txt +++ b/src/projectM-test/CMakeLists.txt @@ -21,7 +21,7 @@ ADD_DEFINITIONS(-DLINUX) if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine) + set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) diff --git a/src/projectM-xmms/CMakeLists.txt b/src/projectM-xmms/CMakeLists.txt index 1aa9d16f0..cb8b28fb0 100644 --- a/src/projectM-xmms/CMakeLists.txt +++ b/src/projectM-xmms/CMakeLists.txt @@ -26,8 +26,8 @@ endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='"${PROJECTM_PREFIX}"') if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine) + set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) + set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS})