- new layout of the projectM lib-dir.

- PROJECTM_..._PLUS variable in config-....inc not needed anymore.
- Support for projectM 1.1 (=1.10)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1030 b956fd51-792f-4845-bead-9b4dfca2ff2c

4 files changed, 10 insertions, 105 deletions

diff --git a/Game/Code/lib/projectM/1.0/cwrapper/projectM.cpp b/Game/Code/lib/projectM/1.0/cwrapper/projectM.cpp
deleted file mode 100644
index ff8e2a2f..00000000
--- a/Game/Code/lib/projectM/1.0/cwrapper/projectM.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "projectM.h"
-
-projectM* projectM_create1(char* config_file) 
-{
-	return new projectM(config_file);
-}
-
-projectM* projectM_create2(int gx, int gy, int fps, int texsize, 
-		int width, int height, char* preset_url, char* title_fonturl, char* title_menuurl)
-{
-	return new projectM(gx, gy, fps, texsize, width, height, 
-		preset_url, title_fonturl, title_menuurl);
-}
-
-void projectM_resetGL(projectM* pm, int width, int height)
-{
-	pm->projectM_resetGL(width, height);
-}
-
-void projectM_setTitle(projectM* pm, char* title)
-{
-	pm->projectM_setTitle(title);
-}
-
-void projectM_renderFrame(projectM* pm)
-{
-	pm->renderFrame();
-}
-
-unsigned projectM_initRenderToTexture(projectM* pm)
-{
-	return pm->initRenderToTexture();
-}
-
-void projectM_key_handler(projectM* pm, projectMEvent event, 
-		projectMKeycode keycode, projectMModifier modifier)
-{
-	pm->key_handler(event, keycode, modifier);
-}
-	    
-void projectM_free(projectM* pm)
-{
-	delete pm;
-}
-
-void PCM_addPCMfloat(projectM* pm, float *PCMdata, int samples)
-{
-	pm->pcm->addPCMfloat(PCMdata, samples);
-}
-
-void PCM_addPCM16(projectM* pm, short pcm_data[2][512])
-{
-	pm->pcm->addPCM16(pcm_data);
-}
-
-void PCM_addPCM16Data(projectM* pm, const short* pcm_data, short samples)
-{
-	pm->pcm->addPCM16Data(pcm_data, samples);
-}
-
-void PCM_addPCM8(projectM* pm, unsigned char pcm_data[2][1024])
-{
-	pm->pcm->addPCM8(pcm_data);
-}
-
-void PCM_addPCM8_512(projectM* pm, const unsigned char pcm_data[2][512])
-{
-	pm->pcm->addPCM8_512(pcm_data);
-}
diff --git a/Game/Code/lib/projectM/1.0/cwrapper/projectM.h b/Game/Code/lib/projectM/1.0/cwrapper/projectM.h
deleted file mode 100644
index a64f2666..00000000
--- a/Game/Code/lib/projectM/1.0/cwrapper/projectM.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __PROJECTM_CWRAPPER_H__

-#define __PROJECTM_CWRAPPER_H__

-

-#include "projectM.hpp"

-
-extern "C" {
-	DLLEXPORT projectM* projectM_create1(char* config_file);
-	DLLEXPORT projectM* projectM_create2(int gx, int gy, int fps, int texsize, 
-		int width, int height, char* preset_url, char* title_fonturl, char* title_menuurl);
-
-	DLLEXPORT void projectM_resetGL(projectM* pm, int width, int height);
-	DLLEXPORT void projectM_setTitle(projectM* pm, char* title);
-	DLLEXPORT void projectM_renderFrame(projectM* pm);
-	DLLEXPORT unsigned projectM_initRenderToTexture(projectM* pm); 
-	DLLEXPORT void projectM_key_handler(projectM* pm, projectMEvent event, 
-		projectMKeycode keycode, projectMModifier modifier);
-	    
-	DLLEXPORT void projectM_free(projectM* pm);
-
-    DLLEXPORT void PCM_addPCMfloat(projectM* pm, float *PCMdata, int samples);
-    DLLEXPORT void PCM_addPCM16(projectM* pm, short [2][512]);
-    DLLEXPORT void PCM_addPCM16Data(projectM* pm, const short* pcm_data, short samples);
-    DLLEXPORT void PCM_addPCM8(projectM* pm, unsigned char [2][1024]);
-	DLLEXPORT void PCM_addPCM8_512(projectM* pm, const unsigned char [2][512]);
-}

-

-#endif
\ No newline at end of file
diff --git a/Game/Code/lib/projectM/1.0/cwrapper/projectM-cwrapper.sln b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.sln
index e05f79a3..e05f79a3 100644
--- a/Game/Code/lib/projectM/1.0/cwrapper/projectM-cwrapper.sln
+++ b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.sln
diff --git a/Game/Code/lib/projectM/1.0/cwrapper/projectM-cwrapper.vcproj b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj
index 9c182cac..013bc6b7 100644
--- a/Game/Code/lib/projectM/1.0/cwrapper/projectM-cwrapper.vcproj
+++ b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj
@@ -20,7 +20,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

 			IntermediateDirectory="$(ConfigurationName)"

 			ConfigurationType="2"

-			CharacterSet="1"

+			CharacterSet="2"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -40,7 +40,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../projectM"

+				AdditionalIncludeDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.1\projectM&quot;;&quot;D:\daten\ultrastar\libprojectM\libs\pthreads\Pre-built.2\include&quot;"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PROJECTMCWRAPPER_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -61,9 +61,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="projectM.lib"

+				AdditionalDependencies="libprojectM.lib"

 				LinkIncremental="2"

-				AdditionalLibraryDirectories="../projectM/Debug"

+				AdditionalLibraryDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.1\projectM\Release&quot;"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				TargetMachine="1"

@@ -118,8 +118,9 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../projectM"

+				AdditionalIncludeDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.1\projectM&quot;;&quot;D:\daten\ultrastar\libprojectM\libs\pthreads\Pre-built.2\include&quot;"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PROJECTMCWRAPPER_EXPORTS"

+				ExceptionHandling="1"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

@@ -137,9 +138,9 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="projectM.lib"

+				AdditionalDependencies="libprojectM.lib"

 				LinkIncremental="1"

-				AdditionalLibraryDirectories="../projectM/Release"

+				AdditionalLibraryDirectories="&quot;D:\daten\ultrastar\libprojectM\libprojectM-1.1\projectM\Release&quot;"

 				GenerateDebugInformation="true"

 				SubSystem="2"

 				OptimizeReferences="2"

@@ -181,7 +182,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

 			>

 			<File

-				RelativePath=".\projectM.cpp"

+				RelativePath=".\projectM-cwrapper.cpp"

 				>

 			</File>

 		</Filter>

@@ -191,7 +192,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

 			>

 			<File

-				RelativePath=".\projectM.h"

+				RelativePath=".\projectM-cwrapper.h"

 				>

 			</File>

 		</Filter>