matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,870 Commits 13 Branches 426 Tags 113 MiB
276098f9db
Commit Graph

170 Commits

Author SHA1 Message Date
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
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
Simon Robertshaw
9bb28cfa36 Dammit 2012-10-29 10:14:51 +00:00
Simon Robertshaw
19163a0332 Yay for syntax error 2012-10-29 10:13:15 +00:00
Simon Robertshaw
5c57115baa More render scons fixes 2012-10-29 10:10:43 +00:00
Simon Robertshaw
5790ab5ce0 Fix scons renderer option 2012-10-29 09:59:07 +00:00
Simon Robertshaw
583ddba744 Renderer option for scons 2012-10-29 09:50:05 +00:00
Bryan Hoyle
271851e32c windows bug fixes, code cleanup 2012-10-20 13:12:54 -04:00
Bryan Hoyle
50234517de found bug, fixed it 2012-10-20 13:06:53 -04:00
Bryan Hoyle
782a7cee15 testing a possible bug fix 2012-10-20 12:57:06 -04:00
Bryan Hoyle
f1ffe50a6a Some scons fixes 2012-10-18 19:41:55 -04:00
Jesse Jaara
f3aa813b98 ElementClasses.cpp and ToolClasses.cpp need to be generated before being added to sources list. 2012-10-06 21:38:50 +03:00
Jesse Jaara
c7ca6caf30 Use 'python2' instead of 'python'. 2012-10-03 00:19:47 +03:00
Jesse Jaara
0cd04ad8d9 Fix a C spesific compiler flag to a C++ variant. 2012-10-02 23:43:58 +03:00
Simon Robertshaw
640a61b3b4 Remove some fancy optimisations for old gcc in OS X 2012-09-25 18:14:39 +01:00
Simon Robertshaw
2833c0d20c No lib detection for OS X 2012-09-25 18:03:58 +01:00
Simon Robertshaw
9ba08768a4 Don't check for libs that are frameworks under OS X 2012-09-25 17:52:43 +01:00
Simon Robertshaw
f30ef6004a Don't set RC tool when not compiling for Windows 2012-09-25 18:19:54 +01:00
Simon Robertshaw
25d872ec48 MacOS X targets for Scons, Fix some inlines for clang 2012-09-25 17:53:48 +01:00
Simon Robertshaw
aeb3f0b473 Add some stuff for MacOS target 2012-09-25 13:44:24 +01:00
Simon Robertshaw
c9caade1c3 Remove Precompiled header stuff as it breaks scons for some reason 2012-09-02 15:08:03 +01:00
Simon Robertshaw
c259521e5e Allow specifying the snapshot ID 2012-08-13 21:32:08 +01:00
Simon Robertshaw
723677d431 Add CPPDEFINES to the compile command 2012-08-13 18:23:33 +01:00
Simon Robertshaw
21821af720 "everything at once" compilation in a seperate arg 2012-08-13 18:07:27 +01:00
Simon Robertshaw
592c858e4c Compile everything at once with --release 2012-08-13 17:29:58 +01:00
Simon Robertshaw
074dcd0b42 Precompile some headers. Fix sconscript to prevent recompiling everything 2012-08-13 15:43:57 +01:00
Bryan Hoyle
859aa0cf14 --opengl works now, had to fix dep issues in linux. TODO: --opengl-renderer 2012-08-12 13:52:22 -04:00
Simon Robertshaw
08b4e5553a Implement some missing lua functions, PNG format creation (requires zlib) 2012-08-11 20:24:48 +01:00
Simon Robertshaw
810ea42f99 Only render gravity lensing if it's enabled, Ctrl and Shift to alter tool strength (Shift = x10, Ctrl = x0.1) 2012-08-10 14:03:23 +01:00
Simon Robertshaw
73b8178a77 Check for bzip2 headers and libs in sconscript, fixes #68 2012-08-09 21:32:04 +01:00
Bryan Hoyle
0e43f2e831 Fix opengl flags in options 2012-08-06 02:30:25 -04:00
Simon Robertshaw
82d2bcc7c2 More scons fixes 2012-08-04 19:30:03 +01:00
Simon Robertshaw
d684136415 Fix sconscript for older scons versions 2012-08-04 19:23:42 +01:00
Savely Skresanov
929d99f80c Autodetect lua5.1 (not sure how to detect lua-5.1 or just lua) 2012-08-04 13:52:10 +01:00
ntoskrnl
baf07e470e Build fixes for FreeBSD 2012-08-04 11:32:48 +01:00
Simon Robertshaw
94bb1ad2df Fix OpenGL check in sconscript 2012-08-02 15:31:40 +01:00
ntoskrnl
a4eee2e2b6 Fix description of --64bit 2012-08-02 15:21:55 +01:00
ntoskrnl
18bf7ce155 Build fixes for WIN64 2012-08-02 15:21:43 +01:00
ntoskrnl
4343faa10f Some modifications for WIN64. SConscript not ready for that yet. 2012-08-02 15:21:31 +01:00