TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

changed Generator to T3D_Generator to prevent problems with newer php versions

Browse source
This commit is contained in:
Thomas Fischer 2014-03-14 19:58:23 +01:00
parent 39b893f1ca
commit 9b49f56bd6
26 changed files with 160 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Tools/projectGenerator/libs/Torque3D.conf
View file

@ -35,7 +35,7 @@ includeLib( 'pcre' );
includeLib( 'convexDecomp' );
// Use FMOD on consoles
if ( Generator::$platform != "360" && Generator::$platform != "ps3" )
if ( T3D_Generator::$platform != "360" && T3D_Generator::$platform != "ps3" )
{
includeLib( 'libvorbis' );
includeLib( 'libogg' );
@ -43,7 +43,7 @@ if ( Generator::$platform != "360" && Generator::$platform != "ps3" )
}
$ext = "DLL";
if ( Generator::$platform == "mac" )
if ( T3D_Generator::$platform == "mac" )
$ext = "Bundle";
// We need to pick the right physics engine to include.
@ -52,7 +52,7 @@ global $PHYSX_SDK_PATH;
//some platforms will not want a shared config
$useSharedConfig = true;
if ( Generator::$platform == "360" || Generator::$platform == "ps3" )
if ( T3D_Generator::$platform == "360" || T3D_Generator::$platform == "ps3" )
$useSharedConfig = false;
//begin either a shared lib config, or a static app config
@ -89,7 +89,7 @@ else
addLibIncludePath( "squish" );
addLibIncludePath( "convexDecomp" );
if ( Generator::$platform != "360" && Generator::$platform != "ps3" )
if ( T3D_Generator::$platform != "360" && T3D_Generator::$platform != "ps3" )
{
addLibIncludePath( "libvorbis/include" );
addLibIncludePath( "libogg/include" );
@ -107,13 +107,13 @@ else
includeModule( 'basicLighting' );
includeModule( 'collada' );
if ( Generator::$platform != "360" && Generator::$platform != "ps3" )
if ( T3D_Generator::$platform != "360" && T3D_Generator::$platform != "ps3" )
{
includeModule( 'vorbis' );
includeModule( 'theora' );
}
if(Generator::$platform == "mac" || Generator::$platform == "win32")
if(T3D_Generator::$platform == "mac" || T3D_Generator::$platform == "win32")
includeModule( 'openal' );
// Demo functionality
@ -142,7 +142,7 @@ else
addProjectDependency( 'pcre' );
addProjectDependency( 'convexDecomp' );
if ( Generator::$platform != "360" && Generator::$platform != "ps3" )
if ( T3D_Generator::$platform != "360" && T3D_Generator::$platform != "ps3" )
{
addProjectDependency( 'libvorbis' );
addProjectDependency( 'libogg' );
@ -162,13 +162,13 @@ else
addProjectDependency( 'nxuStream' );
}
if ( Generator::$platform == "mac" )
if ( T3D_Generator::$platform == "mac" )
{
addProjectDefine( '__MACOSX__' );
addProjectDefine( 'LTM_DESC' );
}
if (Generator::$platform == "win32")
if (T3D_Generator::$platform == "win32")
{
setProjectModuleDefinitionFile('../../' . getLibSrcDir() . 'Torque3D/msvc/torque3d.def');
@ -216,13 +216,13 @@ beginSharedAppConfig( getGameProjectName(), '{CDECDFF9-E125-523F-87BC-2D89DB971C
addEngineSrcDir( 'main' );
if (Generator::$platform == "win32")
if (T3D_Generator::$platform == "win32")
{
addProjectDefine( 'WIN32' );
addProjectDependency( getGameProjectName() . ' DLL' );
}
if (Generator::$platform == "mac")
if (T3D_Generator::$platform == "mac")
{
addProjectDefine( '__MACOSX__' );
addProjectDependency( getGameProjectName() . ' Bundle' );
@ -233,7 +233,7 @@ endSharedAppConfig();
}
// Add solution references for Visual Studio projects
if (Generator::$platform == "win32" || Generator::$platform == "360" || Generator::$platform == "ps3")
if (T3D_Generator::$platform == "win32" || T3D_Generator::$platform == "360" || T3D_Generator::$platform == "ps3")
{
if ( !$useSharedConfig )
beginSolutionConfig( getGameProjectName(), '{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}' );
@ -253,7 +253,7 @@ if ( !$useSharedConfig )
addSolutionProjectRef( 'zlib' );
addSolutionProjectRef( 'convexDecomp' );
if (Generator::$platform == "win32")
if (T3D_Generator::$platform == "win32")
{
addSolutionProjectRef( 'libogg' );
addSolutionProjectRef( 'libvorbis' );

4
Tools/projectGenerator/libs/WebDeploy.conf
View file

@ -21,7 +21,7 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
if (Generator::$platform == "win32")
if (T3D_Generator::$platform == "win32")
{
// Include the web deployment settings
$webDeployConf = realpath($argv[1])."/buildFiles/config/webDeploy.conf";
@ -55,7 +55,7 @@ if (Generator::$platform == "win32")
}
if (Generator::$platform == "mac")
if (T3D_Generator::$platform == "mac")
{
// Include the web deployment settings
$webDeployConf = realpath($argv[1])."/buildFiles/config/webDeploy.mac.conf";

8
Tools/projectGenerator/libs/convexDecomp.conf
View file

@ -29,13 +29,13 @@ beginLibConfig( 'convexDecomp', '{4EF87A4E-16ED-4E64-BF04-841B2675AEE0}' );
// Additional includes
addLibIncludePath( 'convexDecomp' );
if ( Generator::$platform == "360" )
if ( T3D_Generator::$platform == "360" )
addProjectDefine( '_XBOX' );
else if ( Generator::$platform == "ps3" )
else if ( T3D_Generator::$platform == "ps3" )
addProjectDefine( '__CELLOS_LV2__' );
else if ( Generator::$platform == "mac" )
else if ( T3D_Generator::$platform == "mac" )
addProjectDefine( '__APPLE__' );
else if ( Generator::$platform == "win32" )
else if ( T3D_Generator::$platform == "win32" )
addProjectDefine( 'WIN32' );
endLibConfig();

4
Tools/projectGenerator/libs/libbullet.conf
View file

@ -39,8 +39,8 @@ beginLibConfig( 'libbullet', '{4368B65C-F5EF-4D28-B533-B02A04EBE921}' );
addLibSrcDir( 'bullet/src/LinearMath' );
// TODO: Can we do multicore on OSX?
if ( Generator::$platform == "win32" ||
Generator::$platform == "360" )
if ( T3D_Generator::$platform == "win32" ||
T3D_Generator::$platform == "360" )
{
addProjectDefine( 'WIN32' );

10
Tools/projectGenerator/libs/librecast.conf
View file

@ -24,11 +24,11 @@
beginLibConfig( 'librecast', '{F2C0209B-1B90-4F73-816A-A0920FF8B107}' );
// Source
addSrcDir( Generator::getLibSrcDir() . 'recast/DebugUtils/Source', true );
addSrcDir( Generator::getLibSrcDir() . 'recast/Recast/Source', true );
addSrcDir( Generator::getLibSrcDir() . 'recast/Detour/Source', true );
addSrcDir( Generator::getLibSrcDir() . 'recast/DetourCrowd/Source', true );
addSrcDir( Generator::getLibSrcDir() . 'recast/DetourTileCache/Source', true );
addSrcDir( T3D_Generator::getLibSrcDir() . 'recast/DebugUtils/Source', true );
addSrcDir( T3D_Generator::getLibSrcDir() . 'recast/Recast/Source', true );
addSrcDir( T3D_Generator::getLibSrcDir() . 'recast/Detour/Source', true );
addSrcDir( T3D_Generator::getLibSrcDir() . 'recast/DetourCrowd/Source', true );
addSrcDir( T3D_Generator::getLibSrcDir() . 'recast/DetourTileCache/Source', true );
// Additional includes
addLibIncludePath( 'recast/DebugUtils/Include' );