From 5d1653c701d1e52eff5b3f7deba765d3d2640640 Mon Sep 17 00:00:00 2001
From: bank <bank@deelogic.net>
Date: Sun, 23 Sep 2012 13:43:00 +0400
Subject: [PATCH] Updating ProjectGenerator templates for 'make'.

---
 Tools/projectGenerator/templates/makeApp.tpl       | 14 +++++++++-----
 Tools/projectGenerator/templates/makeAppShared.tpl |  5 +++--
 Tools/projectGenerator/templates/makeLib.tpl       |  7 ++++---
 Tools/projectGenerator/templates/makeSo.tpl        |  5 +++--
 Tools/projectGenerator/templates/makeSolution.tpl  |  5 +++++
 5 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Tools/projectGenerator/templates/makeApp.tpl b/Tools/projectGenerator/templates/makeApp.tpl
index 961357448..ae08a7c48 100644
--- a/Tools/projectGenerator/templates/makeApp.tpl
+++ b/Tools/projectGenerator/templates/makeApp.tpl
@@ -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)
diff --git a/Tools/projectGenerator/templates/makeAppShared.tpl b/Tools/projectGenerator/templates/makeAppShared.tpl
index 2473723f9..9a59f8f31 100644
--- a/Tools/projectGenerator/templates/makeAppShared.tpl
+++ b/Tools/projectGenerator/templates/makeAppShared.tpl
@@ -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)
diff --git a/Tools/projectGenerator/templates/makeLib.tpl b/Tools/projectGenerator/templates/makeLib.tpl
index 01dc8988a..85aa22759 100644
--- a/Tools/projectGenerator/templates/makeLib.tpl
+++ b/Tools/projectGenerator/templates/makeLib.tpl
@@ -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
diff --git a/Tools/projectGenerator/templates/makeSo.tpl b/Tools/projectGenerator/templates/makeSo.tpl
index 3534de380..647907e9b 100644
--- a/Tools/projectGenerator/templates/makeSo.tpl
+++ b/Tools/projectGenerator/templates/makeSo.tpl
@@ -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
diff --git a/Tools/projectGenerator/templates/makeSolution.tpl b/Tools/projectGenerator/templates/makeSolution.tpl
index 7c385a076..3675f928e 100644
--- a/Tools/projectGenerator/templates/makeSolution.tpl
+++ b/Tools/projectGenerator/templates/makeSolution.tpl
@@ -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 :=