New SConscript (hopefully better)

Fixes a lot of bugs, also almost all options are no longer needed and are just auto-detected
The-Powder-Toy · Jun 8, 2014 · 6749c25 · 6749c25
1 parent 4440582
commit 6749c25
Show file tree

Hide file tree

Showing 60 changed files with 604 additions and 867 deletions.
diff --git a/SConscript b/SConscript
diff --git a/SConstruct b/SConstruct
@@ -1,2 +1,16 @@
+#run generator.py
+if not GetOption('clean'):
+	execfile("generator.py")
+
 AddOption('--builddir',dest="builddir",default="build",help="Directory to build to.")
 SConscript('SConscript', variant_dir=GetOption('builddir'), duplicate=0)
+if GetOption('clean'):
+	import os, shutil
+	try:
+		shutil.rmtree(".sconf_temp/")
+	except:
+		print "couldn't remove .sconf_temp"
+	try:
+		os.remove(".sconsign.dblite")
+	except:
+		print "couldn't remove .sconsign.dblite"
diff --git a/generator.py b/generator.py
@@ -223,11 +223,5 @@ class {0}: public SimTool
 	f.write(toolContent)
 	f.close()
 
-if(len(sys.argv) > 3):
-    if(sys.argv[1] == "elements"):
-    	generateElements(sys.argv[4:], sys.argv[2], sys.argv[3])
-    elif(sys.argv[1] == "tools"):
-    	generateTools(sys.argv[4:], sys.argv[2], sys.argv[3])
-else:
-	generateElements(os.listdir("src/simulation/elements"), "generated/ElementClasses.cpp", "generated/ElementClasses.h")
-	generateTools(os.listdir("src/simulation/simtools"), "generated/ToolClasses.cpp", "generated/ToolClasses.h")
+generateElements(os.listdir("src/simulation/elements"), "generated/ElementClasses.cpp", "generated/ElementClasses.h")
+generateTools(os.listdir("src/simulation/simtools"), "generated/ToolClasses.cpp", "generated/ToolClasses.h")
diff --git a/src/Config.h b/src/Config.h
@@ -26,20 +26,11 @@
 #ifndef SNAPSHOT_ID
 #define SNAPSHOT_ID 0
 #endif
-
-#ifndef STABLE
-#ifndef BETA
-#define BETA
-#define SNAPSHOT
-#endif
-#endif
 //VersionInfoEnd
 
 //#define IGNORE_UPDATES //uncomment this for mods, to not get any update notifications
 
-#if defined(DEBUG) || defined(RENDERER) || defined(X86_SSE2)
 #define HIGH_QUALITY_RESAMPLE			//High quality image resampling, slower but much higher quality than my terribad linear interpolation
-#endif
 
 #if defined(SNAPSHOT)
 #define IDENT_RELTYPE "S"
@@ -52,14 +43,18 @@
 #if defined(WIN)
 #if defined(_64BIT)
 #define IDENT_PLATFORM "WIN64"
-#else
+#elif defined(_32BIT)
 #define IDENT_PLATFORM "WIN32"
+#else
+#define IDENT_PLATFORM "WIN"
 #endif
 #elif defined(LIN)
 #if defined(_64BIT)
 #define IDENT_PLATFORM "LIN64"
-#else
+#elif defined(_32BIT)
 #define IDENT_PLATFORM "LIN32"
+#else
+#define IDENT_PLATFORM "LIN"
 #endif
 #elif defined(MACOSX)
 #define IDENT_PLATFORM "MACOSX"

diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp
@@ -3,10 +3,13 @@
 #include <map>
 #include <string>
 #include <time.h>
+#ifdef SDL_INC
+#include "SDL/SDL.h"
+#else
 #include "SDL.h"
+#endif
 #ifdef WIN
 #define _WIN32_WINNT 0x0501	//Necessary for some macros and functions, tells windows.h to include functions only available in Windows XP or later
-#include "SDL_syswm.h"
 #include <direct.h>
 #endif
 #include <iostream>
@@ -49,9 +52,13 @@ extern "C" {
 
 using namespace std;
 
-#if defined(USE_SDL) && defined(LIN)
+#if defined(WIN) || defined(LIN)
+#ifdef SDL_INC
+#include <SDL/SDL_syswm.h>
+#else
 #include <SDL_syswm.h>
 #endif
+#endif
 #if defined(USE_SDL) && defined(LIN) && defined(SDL_VIDEO_DRIVER_X11)
 SDL_SysWMinfo sdl_wminfo;
 Atom XA_CLIPBOARD, XA_TARGETS, XA_UTF8_STRING;

diff --git a/SDLMain.h → src/SDLMain.h b/SDLMain.h → src/SDLMain.h
diff --git a/SDLMain.m → src/SDLMain.m b/SDLMain.m → src/SDLMain.m
@@ -5,7 +5,11 @@
     Feel free to customize this file to suit your needs
 */
 
+#ifdef SDL_INC
+#include "SDL/SDL.h"
+#else
 #include "SDL.h"
+#endif
 #include "SDLMain.h"
 #include <sys/param.h> /* for MAXPATHLEN */
 #include <unistd.h>

diff --git a/src/gui/interface/Keys.h b/src/gui/interface/Keys.h
@@ -1,6 +1,10 @@
 
 #if defined(USE_SDL)
+#ifdef SDL_INC
+#include "SDL/SDL.h"
+#else
 #include "SDL.h"
+#endif
 #define KEY_UNKNOWN SDLK_UNKNOWN
 #define KEY_UP SDLK_UP
 #define KEY_NUM_UP SDLK_KP8

diff --git a/src/lua/LuaBit.cpp b/src/lua/LuaBit.cpp
@@ -29,12 +29,7 @@
 
 #define LUA_BITOP_VERSION	"1.0.2"
 
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
+#include "luainc.h"
 
 #ifdef _MSC_VER
 /* MSVC is stuck in the last century and doesn't have C99's stdint.h. */

diff --git a/src/lua/LuaButton.cpp b/src/lua/LuaButton.cpp
@@ -1,10 +1,4 @@
 #ifdef LUACONSOLE
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
 
 #include <iostream>
 #include "LuaButton.h"

diff --git a/src/lua/LuaButton.h b/src/lua/LuaButton.h
@@ -1,11 +1,5 @@
 #pragma once
 
-extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
-}
-
 #include "LuaLuna.h"
 #include "LuaComponent.h"
 

diff --git a/src/lua/LuaCheckbox.cpp b/src/lua/LuaCheckbox.cpp
@@ -1,10 +1,4 @@
 #ifdef LUACONSOLE
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
 
 #include <iostream>
 #include "LuaCheckbox.h"

diff --git a/src/lua/LuaCheckbox.h b/src/lua/LuaCheckbox.h
@@ -1,11 +1,5 @@
 #pragma once
 
-extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
-}
-
 #include "LuaLuna.h"
 #include "LuaComponent.h"
 

diff --git a/src/lua/LuaComponent.cpp b/src/lua/LuaComponent.cpp
@@ -1,10 +1,4 @@
 #ifdef LUACONSOLE
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
 
 #include <iostream>
 #include "LuaComponent.h"

diff --git a/src/lua/LuaComponent.h b/src/lua/LuaComponent.h
@@ -1,11 +1,5 @@
 #pragma once
 
-extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
-}
-
 #include "LuaLuna.h"
 
 namespace ui

diff --git a/src/lua/LuaLabel.cpp b/src/lua/LuaLabel.cpp
@@ -1,10 +1,4 @@
 #ifdef LUACONSOLE
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
 
 #include <iostream>
 #include "LuaScriptInterface.h"

diff --git a/src/lua/LuaLabel.h b/src/lua/LuaLabel.h
@@ -1,11 +1,5 @@
 #pragma once
 
-extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
-}
-
 #include "LuaLuna.h"
 #include "LuaComponent.h"
 

diff --git a/src/lua/LuaLuna.h b/src/lua/LuaLuna.h
@@ -1,10 +1,7 @@
 #pragma once
 //http://lua-users.org/wiki/SimplerCppBinding
 
-extern "C" {
-#include "lua.h"
-#include "lauxlib.h"
-}
+#include "luainc.h"
 
 template <typename T> class Luna
 {

diff --git a/src/lua/LuaProgressBar.cpp b/src/lua/LuaProgressBar.cpp
@@ -1,10 +1,4 @@
 #ifdef LUACONSOLE
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
 
 #include <iostream>
 #include "LuaProgressBar.h"

diff --git a/src/lua/LuaProgressBar.h b/src/lua/LuaProgressBar.h
@@ -1,11 +1,5 @@
 #pragma once
 
-extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
-}
-
 #include "LuaLuna.h"
 #include "LuaComponent.h"
 

diff --git a/src/lua/LuaScriptInterface.h b/src/lua/LuaScriptInterface.h
@@ -1,12 +1,7 @@
 #ifndef LUASCRIPTINTERFACE_H_
 #define LUASCRIPTINTERFACE_H_
 
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
+#include "luainc.h"
 
 #include "CommandInterface.h"
 #include "simulation/Simulation.h"

diff --git a/src/lua/LuaSlider.cpp b/src/lua/LuaSlider.cpp
@@ -1,10 +1,4 @@
 #ifdef LUACONSOLE
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
 
 #include <iostream>
 #include "LuaSlider.h"

diff --git a/src/lua/LuaSlider.h b/src/lua/LuaSlider.h
@@ -1,11 +1,5 @@
 #pragma once
 
-extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
-}
-
 #include "LuaLuna.h"
 #include "LuaComponent.h"
 

diff --git a/src/lua/LuaTextbox.cpp b/src/lua/LuaTextbox.cpp
@@ -1,10 +1,4 @@
 #ifdef LUACONSOLE
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
 
 #include <iostream>
 #include "LuaScriptInterface.h"

diff --git a/src/lua/LuaTextbox.h b/src/lua/LuaTextbox.h
@@ -1,11 +1,5 @@
 #pragma once
 
-extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
-}
-
 #include "LuaLuna.h"
 #include "LuaComponent.h"
 

diff --git a/src/lua/LuaWindow.cpp b/src/lua/LuaWindow.cpp
@@ -1,10 +1,4 @@
 #ifdef LUACONSOLE
-extern "C"
-{
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
-}
 
 #include <iostream>
 #include "LuaScriptInterface.h"

diff --git a/src/lua/LuaWindow.h b/src/lua/LuaWindow.h
@@ -1,11 +1,5 @@
 #pragma once
 
-extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
-}
-
 #include "LuaLuna.h"
 
 #include "gui/interface/Platform.h"

diff --git a/src/lua/luainc.h b/src/lua/luainc.h
@@ -0,0 +1,23 @@
+#ifndef LUAINC_H
+#define LUAINC_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifdef LUA_INC
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
+#include "lua5.1/lualib.h"
+#else
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/socket/auxiliar.c → src/lua/socket/auxiliar.c b/src/socket/auxiliar.c → src/lua/socket/auxiliar.c
diff --git a/src/socket/auxiliar.h → src/lua/socket/auxiliar.h b/src/socket/auxiliar.h → src/lua/socket/auxiliar.h
@@ -31,8 +31,7 @@
 * RCS ID: $Id: auxiliar.h,v 1.9 2005/10/07 04:40:59 diego Exp $
 \*=========================================================================*/
 
-#include "lua.h"
-#include "lauxlib.h"
+#include "../luainc.h"
 
 int auxiliar_open(lua_State *L);
 void auxiliar_newclass(lua_State *L, const char *classname, luaL_reg *func);

diff --git a/src/socket/buffer.c → src/lua/socket/buffer.c b/src/socket/buffer.c → src/lua/socket/buffer.c
@@ -4,9 +4,6 @@
 *
 * RCS ID: $Id: buffer.c,v 1.28 2007/06/11 23:44:54 diego Exp $
 \*=========================================================================*/
-#include "lua.h"
-#include "lauxlib.h"
-
 #include "buffer.h"
 
 /*=========================================================================*\