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

Merge remote-tracking branch 'GarageGames/development' into physx3_basic

Browse source
This commit is contained in:
rextimmy 2014-06-06 22:40:14 +10:00
commit d58a69e76c
527 changed files with 9928 additions and 5548 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tools/projectGenerator/modules/T3D.inc
View file

@ -74,7 +74,7 @@ else
addEngineSrcDir('T3D/gameBase/std');
// Plstform specific stuff.
switch( Generator::$platform )
switch( T3D_Generator::$platform )
{
case "360":
addEngineSrcDir('ts/arch/360');

2
Tools/projectGenerator/modules/advancedLighting.inc
View file

@ -28,7 +28,7 @@ beginModule( 'advancedLighting' );
addEngineSrcDir( 'lighting/advanced' );
addEngineSrcDir( 'lighting/shadowMap' );
switch( Generator::$platform )
switch( T3D_Generator::$platform )
{
case "win32":
addEngineSrcDir( 'lighting/advanced/hlsl' );

10
Tools/projectGenerator/modules/core.inc
View file

@ -31,7 +31,7 @@ addEngineSrcDir('component');
addEngineSrcDir('component/interfaces');
// Core
if (Generator::isApp())
if (T3D_Generator::isApp())
addSrcDir( '../source' );
addEngineSrcDir('console');
@ -59,7 +59,7 @@ addEngineSrcDir('math/test');
addEngineSrcDir('platform');
addEngineSrcDir('cinterface');
switch( Generator::$platform )
switch( T3D_Generator::$platform )
{
case "win32":
case "mac":
@ -80,7 +80,7 @@ addEngineSrcDir('app/net');
// Moved this here temporarily because PopupMenu uses on it and is currently in core
addEngineSrcDir('util/messaging');
switch( Generator::$platform )
switch( T3D_Generator::$platform )
{
case "win32":
addEngineSrcDir('platformWin32');
@ -132,7 +132,7 @@ addEngineSrcDir( 'gfx/video' );
addEngineSrcDir( 'gfx' );
addEngineSrcDir( 'shaderGen' );
switch( Generator::$platform )
switch( T3D_Generator::$platform )
{
case "win32":
//addEngineSrcDir( 'gfx/D3D8' );
@ -199,7 +199,7 @@ addIncludePath( '../../source' ); // product source (relative to solution ou
addIncludePath( getAppEngineSrcDir() ); // main engine source dir relative to app project file
addIncludePath( getAppLibSrcDir() ); // main lib source dir relative to app project file
if ( Generator::$platform == "win32" )
if ( T3D_Generator::$platform == "win32" )
{
addIncludePath( getAppLibSrcDir() . 'directx8' );
addIncludePath( getAppLibSrcDir() . 'openal/win32' );

4
Tools/projectGenerator/modules/dsound.inc
View file

@ -23,13 +23,13 @@
beginModule( 'dsound' );
if ( Generator::$platform == "win32" )
if ( T3D_Generator::$platform == "win32" )
{
addEngineSrcDir('sfx/dsound');
addEngineSrcDir('sfx/xaudio');
addProjectLibInput('x3daudio.lib');
}
else if ( Generator::$platform == "360" )
else if ( T3D_Generator::$platform == "360" )
addEngineSrcDir('sfx/xaudio');
endModule();

2
Tools/projectGenerator/modules/fmod.inc
View file

@ -25,7 +25,7 @@ beginModule( 'fmod' );
$allgood = true;
// Additional includes
switch( Generator::$platform )
switch( T3D_Generator::$platform )
{
case "win32":
case "mac":

2
Tools/projectGenerator/modules/jpeg.inc
View file

@ -30,7 +30,7 @@ addLibSrcDir( 'ljpeg' );
addLibIncludePath( 'ljpeg' );
// Defines
if ( Generator::$platform == "360" )
if ( T3D_Generator::$platform == "360" )
addProjectDefines( 'NO_GETENV;' );
endModule();

2
Tools/projectGenerator/modules/leapMotion.inc
View file

@ -61,7 +61,7 @@ beginModule( 'leapMotion' );
}
// Only Windows is supported at this time
if ( Generator::$platform == "win32" )
if ( T3D_Generator::$platform == "win32" )
{
// Source
addEngineSrcDir( "platform/input/leapMotion" );

4
Tools/projectGenerator/modules/libtheora.inc
View file

@ -27,7 +27,7 @@ addLibSrcDir( 'libtheora/include/theora' );
addLibSrcDir( 'libtheora/lib' );
addLibSrcDir( 'libtheora/lib/dec' );
switch( Generator::$platform )
switch( T3D_Generator::$platform )
{
case "win32":
addLibSrcDir( 'libtheora/lib/dec/x86_vc' );
@ -41,7 +41,7 @@ switch( Generator::$platform )
// As we don't use the encoder, disable this for now.
addLibSrcDir( 'libtheora/lib/enc' );
switch( Generator::$platform )
switch( T3D_Generator::$platform )
{
case "win32":
addLibSrcDir( 'libtheora/lib/enc/x86_32_vs' );

2
Tools/projectGenerator/modules/oculusVR.inc
View file

@ -61,7 +61,7 @@ beginModule( 'oculusVR' );
}
// Only Windows is supported at this time
if ( Generator::$platform == "win32" )
if ( T3D_Generator::$platform == "win32" )
{
// Source
addEngineSrcDir( "platform/input/oculusVR" );

2
Tools/projectGenerator/modules/openal.inc
View file

@ -26,7 +26,7 @@ addEngineSrcDir('sfx/openal');
addEngineSrcDir('sfx/openal/mac');
addEngineSrcDir('sfx/openal/win32');
if ( Generator::$platform == "win32" )
if ( T3D_Generator::$platform == "win32" )
addIncludePath( getAppLibSrcDir() . 'openal/win32' );
?>

8
Tools/projectGenerator/modules/physX3.inc
View file

@ -75,10 +75,16 @@ beginModule( 'physX3' );
// Source
addEngineSrcDir( "T3D/physics/physx3" );
addEngineSrcDir( "T3D/physics/physx3/Cloth" );
addEngineSrcDir( "T3D/physics/physx3/Particles" );
// Includes
addIncludePath( $PHYSX3_SDK_PATH . "/Include" );
addIncludePath( $PHYSX3_SDK_PATH . "/Include/extensions" );
addIncludePath( $PHYSX3_SDK_PATH . "/Include/foundation" );
addIncludePath( $PHYSX3_SDK_PATH . "/Include/characterkinematic" );
addIncludePath( $PHYSX3_SDK_PATH . "/Include/common" );
// Libs
addProjectLibDir( $PHYSX3_SDK_PATH . "/Lib/win32" );
addProjectLibInput( "PhysX3_x86.lib","PhysX3CHECKED_x86.lib" );

2
Tools/projectGenerator/modules/png.inc
View file

@ -30,7 +30,7 @@ beginModule( 'lpng' );
addLibIncludePath( 'lpng' );
// Defines
if ( Generator::$platform == "360" )
if ( T3D_Generator::$platform == "360" )
addProjectDefines( 'PNG_NO_ASSEMBLER_CODE' );
endModule();

2
Tools/projectGenerator/modules/razerHydra.inc
View file

@ -61,7 +61,7 @@ beginModule( 'razerHydra' );
}
// Only Windows is supported at this time
if ( Generator::$platform == "win32" )
if ( T3D_Generator::$platform == "win32" )
{
// Source
addEngineSrcDir( "platform/input/razerHydra" );