Commit Graph

174 Commits

Author SHA1 Message Date
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
ntoskrnl
f94fabd999 Rename WIN32 preprocessor definition to WIN 2012-08-02 15:21:16 +01:00
ntoskrnl
87dfc47c97 Separate operating system and architecture preprocessor definitions
Conflicts:

	SConscript
2012-08-02 15:20:14 +01:00
cracker64
cbf7ca22b0 FAG, please get out of there 2012-07-29 15:02:26 -03:00
Simon Robertshaw
ca1f81a264 Add debug option to sconscript 2012-07-28 18:37:49 +01:00
build.powdertoy.co.uk
bbb14b2059 Fix SConscript: Call generator.py properly 2012-07-23 21:04:50 +01:00
build.powdertoy.co.uk
281f5518b2 Remove makefile, changes to generator, SConscript to work together 2012-07-23 20:58:38 +01:00
Simon Robertshaw
64ebd1117b Output file naming for sconscript 2012-07-23 11:49:58 +01:00
Simon Robertshaw
8d917a204d No StripExecutable 2012-07-22 20:17:58 +01:00
Simon Robertshaw
69b5f35b96 Generate snapshot id if non given 2012-07-22 19:39:58 +01:00
Simon Robertshaw
45c31030a6 Changes to sconscript to allow building with specific version number 2012-07-22 19:33:56 +01:00
Simon Robertshaw
97bf9a517e Snapshot checking 2012-07-22 18:51:05 +01:00
Simon Robertshaw
78b1ffb11d Update sconscript for SSE optimisations 2012-07-20 21:19:37 +01:00
build.powdertoy.co.uk
947102cccf Add more optimisations to release mode 2012-07-20 20:11:55 +01:00
build.powdertoy.co.uk
e77a43d9a4 Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-07-20 20:10:56 +01:00
Bryan Hoyle
85bb0b8506 Typo fix 2012-07-20 13:45:13 -04:00
build.powdertoy.co.uk
d71af3706a Update SConscript 2012-07-11 21:11:13 +01:00
build.powdertoy.co.uk
52c9a9052a Update sconscript 2012-07-08 19:26:31 +01:00
Simon Robertshaw
f5c9da236f Use sdl-config 2012-07-08 14:03:51 +01:00
Simon Robertshaw
e66b250e99 Fix fftw3f detection 2012-07-07 20:13:51 +01:00
Simon Robertshaw
6d49b70df2 SConscript 2012-07-07 19:08:05 +01:00