Commit Graph

107 Commits

Author SHA1 Message Date
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
mniip
4a308cbf66 oh, and remove dependency 2013-08-22 17:52:32 +04:00
cracker64
ce43a28983 revert doxin change 2013-08-11 16:29:10 -04:00
cracker64
f8626347ee sconscript change from doxin 2013-08-11 14:31:09 -04:00
mniip
5a57f23ac5 some sconsript fixes 2013-06-01 19:55:10 +04:00
jacob1
79e5b56c36 fix sconscript 2013-05-30 18:05:46 -04:00
jacob1
3929bdaf54 Documentation for Sconscript by Doxin 2013-05-29 21:37:57 -04:00
mniip
32fe184351 sdl-dir scons parameter 2013-05-17 17:30:44 +04:00
cracker64
196c4e9c66 Typo where LUACONSOLE was never enabled 2013-05-13 15:26:20 -03:00
Simon Robertshaw
c2cdec9e62 Togglable lua scripting 2013-05-11 11:52:35 +01:00
jacob1
a4e75d587f add #ifdef WIN / #idndef WIN around some lua socket files, for easier visual studio compatibility 2013-05-04 19:19:23 -04:00
mniip
e7b29ab9b5 statically linked, or better to say, builtin luasocket 2013-05-02 22:41:01 +04:00
jacksonmj
0787086c81 Make --nofft work on other platforms too, it was still linking with -lfftw3f 2013-04-10 00:36:42 +01:00
Julian Meyer
649e5f2042 Add --nofft option to compile without FFTW3
This should help Mac users who were having trouble compiling.
2013-04-10 00:20:36 +01:00
Simon Robertshaw
bdc69f31c0 Fix includes for GUI stuff 2013-03-22 14:26:24 +00:00
Simon Robertshaw
9479b7f330 Move requestbroker into new folder, make request process function a method of Request 2013-03-14 11:30:24 +00:00
Simon Robertshaw
f1e51ba9bc Small fixes to Sconscript 2013-01-22 20:08:36 +00:00
jacob1
ded94b475d move clipboard functions out of misc.cpp without creating errors 2013-01-18 14:37:24 -05:00
jacob1
73fdfd411c copy support in linux 2013-01-13 15:24:52 -05:00
jacob1
0b6418b78d --stable and --python-ver options 2013-01-12 19:56:11 -05:00
Jesse Jaara
8ad680d955 Reorder liblua searching. Fixes building on systems, which also have lua 5.2 as liblua.so. 2013-01-03 17:14:24 +02:00
jacob1
b0eadcde6c sconscript fix (same as before) 2012-12-31 14:23:22 -05:00
jacob1
2b1454139d Add raspberry pi support (from Candunc) 2012-12-31 14:18:56 -05:00
Simon Robertshaw
1cfc75dba2 Fix paths in Sconscripts for filtering out Gravity file 2012-12-30 12:52:30 +00:00
jacob1
0159c2b5af more scons fixes for windows 2012-12-29 12:45:43 -05:00
jacob1
22a6213000 fix gravity.cpp error on windows with scons (but I still can't get it to work) 2012-12-29 11:22:49 -05:00
jacksonmj
7cb9bb7a25 LINKFLAGS, not LINKFAGS 2012-12-25 20:43:13 +00:00