Commit Graph

183 Commits

Author SHA1 Message Date
jacob1
051d70e6e2 Check for Security.Framework on mac 2020-02-08 14:22:01 -05:00
jacob1
7c916a528a Don't look at generated/ anymore (fixes compile error) 2020-01-20 00:29:21 -05:00
Tamás Bálint Misius
4d52531889
Ditch element and tool classes 2020-01-09 19:22:11 +01:00
suve
3db7feaeff Add the --no-install-prompt option to Sconscript 2019-09-06 09:33:02 -04:00
jacob1
a058409829 Fix static compilation
(probably, just like last time I didn't test this)
2019-09-04 00:16:46 -04:00
jacob1
ac7caab127 Fix --nohttp 2019-08-30 23:42:23 -04:00
jacob1
1dc3e9e296 fix --nofft renderer check 2019-08-29 23:35:04 -04:00
jacob1
5dd4897fa4 Add somewhat ugly --nohttp option
used for the renderer to not include libcurl, because it isn't installed on the tpt server
2019-08-29 23:33:45 -04:00
Ian Bastos
c5c4d92c32 check SDL2 framework on OSX 2019-07-17 01:35:10 +02:00
jacob1
ad712272a3 run curl-config on linux; remove hacks for detecting old mac compiler 2019-03-20 00:06:21 -04:00
jacob1
4734c6e419 Add CURL_STATICLIB when compiling on windows, add possibly needed msvc libraries 2019-03-19 23:03:25 -04:00
Tamás Bálint Misius
fc8740f7d5 Add curl, rework Request and RequestManager a bit 2019-03-18 23:50:38 -04:00
jacob1
2929264885 embed event api compatibility lua script
probably temporary, can't deprecate and remove an extremely common api in the same version.
lua script embed code mostly copied from my mod
2018-11-17 00:09:48 -05:00
jacob1
d4255d1974 minor SConscript cleanup 2018-05-28 11:55:54 -04:00
jacob1
40d836106f update libraries required for static sdl2 compile 2018-05-26 19:03:55 -04:00
jacob1
58127f355b fix windows / renderer compile (renderer requires sdl for now) 2018-05-25 21:19:44 -04:00
jacob1
e5230b5b9f upgrade to SDL 2
Still currently in process, there are some issues:
Windows version doesn't work, mac version might not work, opengl might not work
Icon doesn't work (on Linux at least)
Lua will need some changes, there are some sdl 1.2 hacks in there
When entering fullscreen, the window loses focus
When holding down mouse out of bounds, mouse move events stop being sent
When letting go of mouse out of bounds, mouseup event doesn't take into account double scale mode
Clicking on startup without moving mouse will draw at 0,0 for a frame
Renderer probably won't compile because USE_SDL doesn't entirely work

... and maybe others

Some nice things were done though:
no more blit2, sdl can do the scaling itself
3d effect removed, no reason to support this joke any longer
No need to support copy/paste ourselves, sdl does it now
text handling done much better now, separate events for key presses and text input
when a new window is shown, all events ignored until next tick (ignore textinput event if window shown from key press event like console)
2018-05-25 21:19:44 -04:00
mniip
196371316d Temporary workaround to allow compilation on MinGW 2018-05-10 20:40:25 +03:00
mniip
32aaafee94 Move data into either cpp files or const arrays 2018-05-08 07:38:55 +03:00
mniip
c0c550e920 Add a new font editor 2018-04-29 18:49:40 +03:00
jacob1
491d61a9ca remove msvc "add virus" compile flag 2018-03-18 10:37:10 -04:00
jacob1
883484e2f9 remove -flto because it actually makes tpt significantly slower when compiled on the build server
worked fine on my computer, maybe something with the older gcc version? Affected both lin64 and lin32 versions. /LTGC works fine on msvc also, so stays enabled.

-flto can be added manually with environment variables for anyone that wants to use it
2018-03-01 23:52:17 -05:00
wolfy1339
a435b5f7b9 --sse3 doesn't work on MSVC, so don't let people use it 2018-02-24 18:24:28 -05:00
jacob1
39d62f1aad add -flto (link time optimization)
msvc was already using /LTGC
also, add /GL to all files in msvc, may provide some additional help
2018-02-21 23:27:31 -05:00
jacob1
1237b49e37 allow compiling renderer with --msvc in scons 2018-02-11 14:47:36 -05:00
jacob1
887d60628d use c++11, use unique_ptr in GameSave::SerializeOPS 2017-12-27 11:50:09 -05:00
wolfy1339
d7a27cc682 FreeBSD build fixes (#517) 2017-11-23 14:38:47 -05:00
jacob1
9c095ff3d7 don't use alternate PWT32_STATIC_LIB define in msvc either 2017-10-13 00:47:07 -04:00
jacob1
3c2de70564 fix compilation / ensure this check only runs when compiling on windows 2017-10-13 00:03:35 -04:00
wolfy1339
536b20b164 Fix pthread deprecation warning, fixes #502 2017-10-12 23:33:05 -04:00
jacob1
a97dad4db5 Mac luajit crash fix
Doesn't affect official because I added these flags properly before making SConscript do it
2017-10-09 00:12:26 -04:00
jacob1
940fa80047 revert 'Fix deprecation warnings from pthread (#510)' 7847a3ab11
not everyone will have the newer pthread and the deprecated define probably works on all versions of pthread
2017-10-07 17:45:28 -04:00
wolfy1339
b3ee23e45c Fix errors when using --msvc (#509) 2017-10-07 17:32:04 -04:00
wolfy1339
7847a3ab11 Fix deprecation warnings from pthread (#510) 2017-10-07 17:31:35 -04:00
jacob1
1c275e943f make print statements python 3 compatible 2017-10-03 21:14:16 -04:00
Dmitry Marakasov
fffe1b0c40 Fix SConscript syntax (#507) 2017-09-21 09:06:38 -04:00
jacob1
631570cbd0 mac luajit fix, version 92.5.336 2017-09-20 20:42:24 -04:00
jacob1
e458d675bf Fix LINKFLAGS env variable being overwritten when compiling for OS X 2017-09-11 22:04:25 -04:00
jacob1
4f52d34a9d copy STRIP env var into scons env var
TODO: an option to just copy everything, which is apparently needed on some platforms
2017-09-07 23:10:13 -04:00
jacob1
873c2230dc add alternate luajit name (my own custom name), update readme date 2017-09-04 22:14:47 -04:00
jacob1
57e7196e56 fix sconscript fail 2017-02-20 19:20:21 -05:00
jacob1
9445c24611 prevent anti-virus false positives by changing compile options to more closely match default VS 2015 options 2017-01-21 00:49:59 -05:00
jacob1
22d6e23d36 fix icon with msvc, support windows xp (pls don't use windows xp though) 2016-11-02 00:01:39 -04:00
jacob1
8f78486e08 Fix --msvc sconscript option (did not work for debug or static builds) 2016-10-17 23:24:02 -04:00
Simon Robertshaw
4468462ce9 Sconscript: Symbols option when making optimised/release builds. 2016-07-12 22:34:03 +01:00
Simon Robertshaw
0cf117a5f0 Better hack for library checking on OS X 2016-07-11 23:30:11 +01:00
jacob1
e8817489be these --static flags should be optional 2016-07-10 21:08:16 -04:00
jacob1
a8427ef33a only use -Wno-unused-result on Linux, also actually fix the unused results that we could possibly care about
Fixes cross compilers, TODO: I don't think scons can check if a flag exists but might support adding a test for that, even if through hacky means, like CheckFramework
2016-04-26 23:55:14 -04:00
jacob1
6624550dc1 fix a ton of build server warnings (they were all the same) 2016-04-26 23:28:52 -04:00
jacob1
db9d7399d1 Use -O3 on all platforms again (mac crash is probably fixed -O2 causes false positives in AVG) 2016-03-27 23:18:13 -04:00