diff options
Diffstat (limited to 'Game/Code/lib/projectM/cwrapper')
| -rw-r--r-- | Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp | 6 | ||||
| -rw-r--r-- | Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h | 14 | ||||
| -rw-r--r-- | Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp index 4b81130d..ebf43554 100644 --- a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp +++ b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp @@ -2,7 +2,7 @@ #define PM_CLASS(pm) ((projectM*)pm) -#if (PROJECTM_VERSION_INT >= 1010000) +#if (PROJECTM_VERSION_INT > 1000000) #define PM_PCM(pm) (PM_CLASS(pm)->pcm()) #else #define PM_PCM(pm) (PM_CLASS(pm)->pcm) @@ -13,7 +13,7 @@ projectM_ptr projectM_create1(char* config_file) return projectM_ptr(new projectM(config_file)); } -#if (PROJECTM_VERSION_INT < 1010000) +#if (PROJECTM_VERSION_INT < 1000000) projectM_ptr projectM_create2(int gx, int gy, int fps, int texsize, int width, int height, char* preset_url, char* title_fonturl, char* title_menuurl) @@ -80,7 +80,7 @@ void PCM_addPCM8_512(projectM_ptr pm, const unsigned char pcm_data[2][512]) #define COPY_FIELD(c_ptr, s, fld) (c_ptr->fld = s.fld) -#if (PROJECTM_VERSION_INT >= 1010000) +#if (PROJECTM_VERSION_INT > 1000000) void projectM_settings(projectM_ptr pm, Settings* settings) { const projectM::Settings& pmSettings = PM_CLASS(pm)->settings(); diff --git a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h index 630becbb..43f36ef4 100644 --- a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h +++ b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h @@ -3,17 +3,19 @@ #include "projectM.hpp" -#define PROJECTM_VERSION_1_00_00 1000000 // 1.00.00 = 1.0 or 1.01 -#define PROJECTM_VERSION_1_10_00 1010000 // 1.10.00 = 1.1 +// PROJECTM_VERSION define is not very helpful, lets create our own +#define PROJECTM_VERSION_1_00_00 1000000 // 1.00.00 = 1.0 or 1.01 (same version number for 1.0 and 1.01) +#define PROJECTM_VERSION_1_10_00 1010000 // 1.10.00 = 1.1 (bigger than 1.2 due to strange versioning) +#define PROJECTM_VERSION_1_02_00 1002000 // 1.02.00 = 1.2 // version of projectM to wrap (see PROJECTM_VERSION) #ifndef PROJECTM_VERSION_INT -#define PROJECTM_VERSION_INT PROJECTM_VERSION_1_10_00 +#define PROJECTM_VERSION_INT PROJECTM_VERSION_1_02_00 #endif extern "C" { - #if (PROJECTM_VERSION_INT >= 1010000) + #if (PROJECTM_VERSION_INT > 1000000) struct Settings { int meshX; int meshY; @@ -36,7 +38,7 @@ extern "C" { typedef void* projectM_ptr; DLLEXPORT projectM_ptr projectM_create1(char* config_file); - #if (PROJECTM_VERSION_INT < 1010000) + #if (PROJECTM_VERSION_INT < 1000000) DLLEXPORT projectM_ptr projectM_create2(int gx, int gy, int fps, int texsize, int width, int height, char* preset_url, char* title_fonturl, char* title_menuurl); @@ -57,7 +59,7 @@ extern "C" { DLLEXPORT void PCM_addPCM8(projectM_ptr pm, unsigned char [2][1024]); DLLEXPORT void PCM_addPCM8_512(projectM_ptr pm, const unsigned char [2][512]); - #if (PROJECTM_VERSION_INT >= 1010000) + #if (PROJECTM_VERSION_INT > 1000000) DLLEXPORT void projectM_settings(projectM_ptr pm, Settings* settings); #endif } diff --git a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj index 013bc6b7..c0902099 100644 --- a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj +++ b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj @@ -118,7 +118,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""D:\daten\ultrastar\libprojectM\libprojectM-1.1\projectM";"D:\daten\ultrastar\libprojectM\libs\pthreads\Pre-built.2\include""
+ AdditionalIncludeDirectories=""D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM";"D:\daten\ultrastar\libprojectM\libs\pthreads\Pre-built.2\include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROJECTMCWRAPPER_EXPORTS"
ExceptionHandling="1"
RuntimeLibrary="2"
@@ -140,7 +140,7 @@ Name="VCLinkerTool"
AdditionalDependencies="libprojectM.lib"
LinkIncremental="1"
- AdditionalLibraryDirectories=""D:\daten\ultrastar\libprojectM\libprojectM-1.1\projectM\Release""
+ AdditionalLibraryDirectories=""D:\daten\ultrastar\libprojectM\libprojectM-1.2.0\projectM\Release""
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
|