aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp
diff options
context:
space:
mode:
authortobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-08-06 15:10:33 +0000
committertobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-08-06 15:10:33 +0000
commit91b8d206affb6c40cd874d17174a789414f6d4a9 (patch)
tree0d7f9ba699c4cac2be10ddb8d5d24bce3bf673be /Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp
parent6949672f37c3b05f8930b132574740ec8ed03ed0 (diff)
downloadusdx-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 '')
-rw-r--r--Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp6
1 files changed, 3 insertions, 3 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();