Commit Graph

133 Commits

Author SHA1 Message Date
jacob1
9b8e6c0f8b Remove -O3 on OS X, replace with -O2 for other platforms 2016-03-10 03:31:43 +00:00
jacob1
1daeca781e compile with -DDEBUG when using --debugging sconscript flag 2016-03-07 21:22:29 -05:00
jacob1
1d295fbb36 OS X: check for SDL framework before SDL library 2016-01-26 05:35:16 +00:00
jacob1
de2f5fe36d More mac compiling fixes that don't actually fix anything 2016-01-24 23:12:34 +00:00
jacob1
dfbfb459d1 Fix mac sdl compile (apparently it actually did need to run sdl-config) 2016-01-24 21:44:24 +00:00
jacob1
82257e5e39 don't run sdl-config when cross compiling for mac
I guess it should only be run when compiling for linux or cross compiling for windows
2016-01-24 15:54:43 -05:00
jacob1
a6f49adae2 look for normal SDL library before SDL framework on OS X
before it refused to even look for the library, it only checked for the framework
2016-01-24 15:42:37 -05:00
wolfy1339
a6f64055a3 SConscript: Fix some inconsistencies 2015-12-21 19:26:56 -05:00
jacob1
b80cc932d1 check for lib named 'lua' when using --lua52 2015-06-12 00:16:42 -04:00
jacob1
315b07c294 use -static-libstdc++ with --static, check for libdl on linux 2015-05-29 13:51:17 -04:00
jacob1
6c725cc405 fix some cross compiling setups
"i686-w64-mingw32" is actually a 32 bit compiler, and using --tool directly didn't update path before
2015-05-26 00:09:09 -04:00
Aditya Vaidya
13cc593d13 Fixed most spelling errors in code. 'originaly' is read as 'original Y', so not a typo 2015-05-18 15:16:01 -05:00
wolfy1339
6606d72df0 Fix compiling on Windows 2015-03-16 20:00:55 -04:00
mniip
1eb8940c9a Fix LUA_R_INCL not being used on linux 2015-03-06 00:17:25 +03:00
jacob1
316d0f1ace --luajit and --lua52 compile options
no longer looks for lua 5.2 unless you tell it to
2015-02-13 18:20:52 -05:00
jacob1
62040154d9 --luajit option (only tested on Linux for now) 2015-02-06 23:11:54 -05:00
jacob1
b1a3c404b6 fix platform / sconscript flag specific warnings, --no-warnings no longer defaults to true 2015-01-16 23:39:42 -05:00
wolfy1339
fdda2fb123 Fix SConscript error when using --wall 2015-01-11 15:54:06 -05:00
jacob1
28516c24e9 msvc compiling fixes 2014-09-04 17:21:39 -04:00
jacob1
925ff1da3c add lua5.2 support for no particular reason 2014-08-22 01:25:34 -04:00
jacob1
734368d912 fix debug compiling 2014-08-07 22:03:57 -04:00
jacob1
92237cad5d remove -funsafe-loop-optimizations on mac 2014-08-01 17:06:45 -04:00
jacob1
fee3635274 more sconscript fixes 2014-08-01 15:05:37 -04:00
jacob1
78a06e50b7 change .format to support python 2.6 2014-08-01 13:58:08 -04:00
jacob1
f0fb88b48d remove _32BIT also 2014-07-06 11:41:11 -04:00
jacob1
8f2a0d3eb3 fix compiling problems 2014-07-06 11:31:40 -04:00
jacob1
856aae44ae fix scons --help 2014-06-30 11:41:48 -04:00
jacob1
00de5741e0 Fix scons option descriptions - c9df5869d4a2 2014-06-18 16:22:36 -04:00
jacob1
c44e734abe fix crashes when the selected element is NULL (via lua), add gfx.getHexColor (inverse of gfx.getColors) 2014-06-09 17:42:44 -04:00
jacob1
89ffa60529 New graphics api function: getColors, returns r, b, g, and a from a hex color
Also, remove generated/ and build/generated when using scons -c
2014-06-09 16:50:49 -04:00
jacob1
75e2d88796 remove regex dependency / old docs 2014-06-08 20:08:00 -04:00
jacob1
6749c2547f New SConscript (hopefully better)
Fixes a lot of bugs, also almost all options are no longer needed and are just auto-detected
2014-06-08 19:33:58 -04:00
jacksonmj
4b52209933 Fix copying multiple CFLAGS/CCFLAGS from environment in Sconscript 2014-04-15 21:28:19 +01:00
jacksonmj
ba850ade83 Add --32bit flag for scons.
-m32 is no longer specified by default, fixes #214
2014-04-14 23:02:39 +01:00
jacksonmj
6b1b03a17e scons: allow copying of CCFLAGS (for C++ files) from the environment 2014-04-14 22:55:29 +01:00
jacksonmj
216b336eaf Use new src/simulation/simtools path in SConscript 2014-01-26 01:27:13 +00:00
jacob1
c4562ec73e check to make sure flood fill doesn't crash when pmap is errored (?) 2013-12-29 11:04:28 -05:00
mniip
f1cbff5d2e Merge branch 'master' into develop 2013-12-18 23:22:39 +04:00
jacob1
7e6a51cdfa Hotfix: fix compiling
Also an attempt to fix my git problems
2013-12-18 13:56:27 -05:00
mniip
740ec147cd feeeeeeeeeeeex 2013-12-09 04:51:15 +04:00
jacob1
f65ea547e7 fix lua related compiling errors on windows 2013-12-08 13:18:51 -05:00
jacob1
ee7435001f fix lua related compiling errors on windows 2013-12-08 13:15:19 -05:00
Simon Robertshaw
0894aaa7fa Fix strcasecmp defined on Windows, add warnings as errors compile argument, always supress offsetof warnings 2013-10-30 19:46:34 +00:00
jacob1
0180c9b15a fix remaining warnings, fix compiling errors when using --release 2013-10-29 23:55:10 -04:00
mniip
bf908bbfbf Fix various warnings, remove silly useless NO_INLINE system, remove the need for -fkeep-inline-functions 2013-10-30 04:47:07 +04:00
jacob1
479528eaef --copy_env copies LIBPATH (test to fix windows crosscompile) 2013-10-25 15:18:40 -04:00
jacob1
2ffe175c1b fix crosscompiling, --lua-dir was being ignored 2013-10-25 12:05:30 -04:00
jacob1
b4761e47dd fix Sconscript 2013-10-20 09:54:09 -04:00
jacksonmj
eea006ad6f SConscript changes from Doxin - option for scons to copy environment variables CC, CXX, LD, CFLAGS 2013-10-19 14:03:37 +01:00
jacob1
13309379f9 add a --fullclean option to fix errors (from Doxin) 2013-09-24 10:07:22 -04:00