From 91b8d206affb6c40cd874d17174a789414f6d4a9 Mon Sep 17 00:00:00 2001 From: tobigun Date: Wed, 6 Aug 2008 15:10:33 +0000 Subject: support for projectM 1.2 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1221 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp | 6 +++--- Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h | 14 ++++++++------ .../lib/projectM/cwrapper/projectM-cwrapper.vcproj | 4 ++-- Game/Code/lib/projectM/projectM-1_0.inc | 19 ++++++++++++++++--- Game/Code/lib/projectM/projectM.pas | 4 ++-- 5 files changed, 31 insertions(+), 16 deletions(-) (limited to 'Game/Code') 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 @@ /> = 1010000} +{$IF PROJECTM_VERSION > 1000000} // > 1.01 procedure _projectM_settings(pm: _PProjectM; settings: PSettings); cdecl; external libprojectM_cwrapper name 'projectM_settings'; {$IFEND} @@ -157,7 +170,7 @@ begin KeyHandler(PROJECTM_KEYDOWN, PROJECTM_K_F3, PROJECTM_KMOD_LSHIFT); end; -{$IF PROJECTM_VERSION >= 1010000} +{$IF PROJECTM_VERSION > 1000000} // > 1.01 procedure TProjectM.Settings(var settings: TSettings); begin _projectM_settings(data, @settings); diff --git a/Game/Code/lib/projectM/projectM.pas b/Game/Code/lib/projectM/projectM.pas index 29e9a60c..4adba17d 100644 --- a/Game/Code/lib/projectM/projectM.pas +++ b/Game/Code/lib/projectM/projectM.pas @@ -178,7 +178,7 @@ type private data: Pointer; public - {$IF PROJECTM_VERSION < 1000000} + {$IF PROJECTM_VERSION < 1000000} // 0.9x constructor Create(gx, gy: integer; fps: integer; texsize: integer; width, height: integer; const presetsDir, fontsDir: string; @@ -214,7 +214,7 @@ type keycode: TProjectMKeycode; modifier: TProjectMModifier); - {$IF PROJECTM_VERSION >= 1010000} + {$IF PROJECTM_VERSION > 1000000} // > 1.01 procedure Settings(var settings: TSettings); {$IFEND} -- cgit v1.2.3