TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-28 19:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'linux' of https://github.com/just-bank/Torque3D into just-bank-linux

Browse source
This commit is contained in:
David Wyand 2012-10-02 13:25:08 -04:00
commit 2d9fa140ed
45 changed files with 597 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,8 @@ addEngineSrcDir('environment');
addEngineSrcDir('forest');
addEngineSrcDir('forest/ts');
addEngineSrcDir('forest/editor');
if(getToolBuild())
addEngineSrcDir('forest/editor');
addEngineSrcDir('ts');
addEngineSrcDir('ts/arch');
@ -84,6 +85,8 @@ switch( Generator::$platform )
// Fall through
case "mac":
case "linux":
case "linux_dedicated":
addEngineSrcDir( 'terrain/glsl' );
addEngineSrcDir( 'forest/glsl' );
break;

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

@ -37,6 +37,8 @@ beginModule( 'advancedLighting' );
addEngineSrcDir( 'lighting/advanced/hlsl' );
break;
case "mac":
case "linux":
case "linux_dedicated":
addEngineSrcDir( 'lighting/advanced/glsl' );
break;
}

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

@ -35,7 +35,7 @@ beginModule( 'bullet' );
{
addProjectDependency( 'libbullet' );
if (Generator::$platform != "mac")
if (Generator::$platform != "win32")
addSolutionProjectRef( 'libbullet' );
}

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

@ -110,8 +110,10 @@ switch( Generator::$platform )
addEngineSrcDir('windowManager/ps3');
break;
case "linux":
case "linux_dedicated":
addEngineSrcDir('windowManager/dedicated');
case "linux":
addEngineSrcDir('platformX86UNIX');
addEngineSrcDir('platformX86UNIX/threads');
addEngineSrcDir('platformPOSIX');
@ -135,12 +137,12 @@ switch( Generator::$platform )
addEngineSrcDir( 'gfx/D3D' );
addEngineSrcDir( 'gfx/D3D9' );
addEngineSrcDir( 'gfx/D3D9/pc' );
addEngineSrcDir( 'shaderGen/hlsl' );
addEngineSrcDir( 'shaderGen/HLSL' );
break;
case "360":
addEngineSrcDir( 'gfx/D3D9' );
addEngineSrcDir( 'gfx/D3D9/360' );
addEngineSrcDir( 'shaderGen/hlsl' );
addEngineSrcDir( 'shaderGen/HLSL' );
addEngineSrcDir( 'shaderGen/360' );
break;
case "mac":
@ -150,7 +152,16 @@ switch( Generator::$platform )
addEngineSrcDir( 'gfx/gl' );
addEngineSrcDir( 'gfx/gl/ggl' );
addEngineSrcDir( 'gfx/gl/ggl/generated' );
addEngineSrcDir( 'shaderGen/glsl' );
addEngineSrcDir( 'shaderGen/GLSL' );
break;
case "linux":
case "linux_dedicated":
//addEngineSrcDir( 'gfx/gl/ggl/x11' ); // This one is not yet implemented!
// GFX - GGL
addEngineSrcDir( 'gfx/gl' );
addEngineSrcDir( 'gfx/gl/ggl' );
addEngineSrcDir( 'gfx/gl/ggl/generated' );
addEngineSrcDir( 'shaderGen/GLSL' );
break;
case "ps3":
addEngineSrcDir( 'gfx/gl/ggl/ps3' );
@ -159,7 +170,7 @@ switch( Generator::$platform )
addEngineSrcDir( 'gfx/gl' );
addEngineSrcDir( 'gfx/gl/ggl' );
addEngineSrcDir( 'gfx/gl/ggl/generated' );
addEngineSrcDir( 'shaderGen/glsl' );
addEngineSrcDir( 'shaderGen/GLSL' );
break;
}