Ver Fonte

Updating ProjectGen modules to play nice with Linux builds.

bank há 13 anos atrás
pai
commit
f65bb9c34f

+ 4 - 1
Tools/projectGenerator/modules/T3D.inc

@@ -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 - 0
Tools/projectGenerator/modules/advancedLighting.inc

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

+ 1 - 1
Tools/projectGenerator/modules/bullet.inc

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

+ 16 - 5
Tools/projectGenerator/modules/core.inc

@@ -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;
 }