diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-08-06 15:10:33 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-08-06 15:10:33 +0000 |
| commit | 91b8d206affb6c40cd874d17174a789414f6d4a9 (patch) | |
| tree | 0d7f9ba699c4cac2be10ddb8d5d24bce3bf673be /Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h | |
| parent | 6949672f37c3b05f8930b132574740ec8ed03ed0 (diff) | |
| download | usdx-91b8d206affb6c40cd874d17174a789414f6d4a9.tar.gz usdx-91b8d206affb6c40cd874d17174a789414f6d4a9.tar.xz usdx-91b8d206affb6c40cd874d17174a789414f6d4a9.zip | |
support for projectM 1.2
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1221 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h')
| -rw-r--r-- | Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h | 14 |
1 files changed, 8 insertions, 6 deletions
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 } |