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 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

6
Tools/projectGenerator/btargets/targets.inc
View file

@ -153,7 +153,7 @@ $c = BuildTarget::add( 'Make', // Name
$c->setSolutionInfo( 'makeSolution.tpl', '', '' );
$c->setFileExtensions( 'c', 'cc', 'h', 'cpp', 'inl', 'asm' );
$c->setFileExtensions( 'c', 'cc', 'cpp', 'asm' );
$c->setPlatforms( "linux" );
@ -175,7 +175,7 @@ $c = BuildTarget::add( 'Make Dedicated', // Name
$c->setSolutionInfo( 'makeSolution.tpl', '', '' );
$c->setFileExtensions( 'c', 'cc', 'h', 'cpp', 'inl', 'asm' );
$c->setFileExtensions( 'c', 'cc', 'cpp', 'asm' );
$c->setPlatforms( "linux_dedicated" );
@ -197,7 +197,7 @@ $c = BuildTarget::add( 'build', // Name
'', // ActiveX Project Template
'.txt' );
$c->setFileExtensions( 'c', 'cc', 'h', 'cpp', 'inl', 'asm', 'm', 'mm' );
$c->setFileExtensions( 'c', 'cc', 'cpp', 'asm', 'm', 'mm' );
// NO PLATFORMS - SO ALL OR NONE?
$c->setPlatforms("");

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

14
Tools/projectGenerator/templates/makeApp.tpl
View file

@ -12,13 +12,17 @@ SOURCES := {foreach from=$dirWalk item=file key=key}
{/foreach}
LDFLAGS := -g -m32
LDLIBS := -lstdc++
CFLAGS := -MMD -I. -Wfatal-errors -m32
LDLIBS := -lstdc++ -lm -lSDL -lpthread -lrt
{foreach item=def from=$projLibs}LDLIBS += -l{$def}
{/foreach}
CFLAGS := -MMD -I. -Wfatal-errors -m32 -msse -mmmx -march=i686 -pipe
{foreach item=def from=$projIncludes}CFLAGS += -I{$def}
{/foreach}
CFLAGS += -DUNICODE;
CFLAGS += -DUNICODE
CFLAGS += -DLINUX
{foreach item=def from=$projDefines}CFLAGS += -D{$def}
{/foreach}
@ -28,9 +32,9 @@ CFLAGS_DEBUG += -DTORQUE_DEBUG
CFLAGS_DEBUG += -DTORQUE_DEBUG_GUARD
CFLAGS_DEBUG += -DTORQUE_NET_STATS
CFLAGS += -O3
CFLAGS += -O0
#CC := gcc
CC := gcc
LD := gcc
APP_TARGETS += $(APPNAME)

5
Tools/projectGenerator/templates/makeAppShared.tpl
View file

@ -13,12 +13,13 @@ SOURCES := {foreach from=$dirWalk item=file key=key}
LDFLAGS := -g -m32
LDLIBS := -lstdc++
CFLAGS := -MMD -I. -Wfatal-errors -m32
CFLAGS := -MMD -I. -Wfatal-errors -m32 -msse -mmmx -march=i686
{foreach item=def from=$projIncludes}CFLAGS += -I{$def}
{/foreach}
CFLAGS += -DUNICODE
CFLAGS += -DLINUX
{foreach item=def from=$projDefines}CFLAGS += -D{$def}
{/foreach}
@ -30,7 +31,7 @@ CFLAGS_DEBUG += -DTORQUE_DEBUG_GUARD
CFLAGS += -O3
#CC := gcc
CC := gcc
LD := gcc
APP_TARGETS += $(APPNAME)

7
Tools/projectGenerator/templates/makeLib.tpl
View file

@ -15,13 +15,14 @@ SOURCES := {foreach from=$dirWalk item=file key=key}
{/foreach}
LDFLAGS_{$projName} := -g -m32
LDLIBS_{$projName} := -lstdc++
CFLAGS_{$projName} := -MMD -I. -m32
#LDLIBS_{$projName} := -lstdc++
CFLAGS_{$projName} := -MMD -I. -m32 -msse -mmmx -march=i686
{foreach item=def from=$projIncludes}CFLAGS_{$projName} += -I{$def}
{/foreach}
CFLAGS_{$projName} += -DUNICODE
CFLAGS_{$projName} += -DLINUX
{foreach item=def from=$projDefines}CFLAGS_{$projName} += -D{$def}
{/foreach}
@ -33,7 +34,7 @@ CFLAGS_DEBUG_{$projName} += -DTORQUE_NET_STATS
CFLAGS_{$projName} += -O3
#CC := gcc
CC := gcc
LD := gcc
TARGET_{$projName} := {$libDir}/compiled/Make/{$projName}.a

5
Tools/projectGenerator/templates/makeSo.tpl
View file

@ -22,6 +22,7 @@ CFLAGS_{$projName} := -MMD -I. -m32 -mmmx -msse -march=i686
{/foreach}
CFLAGS_{$projName} += -DUNICODE
CFLAGS_{$projName} += -DLINUX
{foreach item=def from=$projDefines}CFLAGS_{$projName} += -D{$def}
{/foreach}
@ -31,9 +32,9 @@ CFLAGS_DEBUG_{$projName} += -DTORQUE_DEBUG
CFLAGS_DEBUG_{$projName} += -DTORQUE_DEBUG_GUARD
CFLAGS_DEBUG_{$projName} += -DTORQUE_NET_STATS
CFLAGS_{$projName} += -O3
CFLAGS_{$projName} += -O0
#CC := gcc
CC := gcc
LD := gcc
SHARED_LIB_TARGETS += {$projName}.so

5
Tools/projectGenerator/templates/makeSolution.tpl
View file

@ -3,6 +3,11 @@
# copyright on the actual sources.
# Copyright 2005 Jon Watte.
# This sets the option for how many instances of gcc we'll run at the
# same time, one per CPU core in this case. This speeds up build time.
# Adjust to your amount of cores.
OPTIONS := --jobs=4
DEPS :=
LIB_TARGETS :=
LIB_TARGETS_DEBUG :=