Commit graph

156 commits

Author SHA1 Message Date
Clownacy
2c3a4a3620 Fix Makefile LTO
Now applies to CFLAGS as well
2020-01-22 23:39:52 +00:00
Clownacy
3263668156 Merge branch 'accurate' into portable 2020-01-22 23:35:49 +00:00
Clownacy
867af9f090 Add option to the Makefile to enable LTO 2020-01-22 23:34:12 +00:00
Clownacy
4cbc56e272 Add OpenGL ES 2.0 renderer 2020-01-20 13:49:30 +00:00
Clownacy
1c0c88074e Fix Resources.cpp Makefile rule 2020-01-15 18:24:52 +00:00
Clownacy
f7b8373ad7 Merge branch 'accurate' into portable 2020-01-15 08:18:30 +00:00
Clownacy
727b3eee0d Capitalise 'Clang' 2020-01-15 08:16:57 +00:00
Clownacy
a32593f51a Make pkg-config user-definable
The Switch port relies on an alternate pkg-config
2020-01-15 08:06:54 +00:00
Clownacy
c7bd555eef Merge branch 'accurate' into portable 2020-01-15 08:01:23 +00:00
Clownacy
dba45f7d0f Makefile: Specify file extensions
This matches the portable branch's CMakeLists.txt, and make mixed
C/C++ code less awkward-looking.
2020-01-15 07:54:33 +00:00
Clownacy
a1937b4730 Backport the portable branch's warnings 2020-01-15 07:45:36 +00:00
Clownacy
2a497a4aae Backport the enhanced branch's C support
Currently, the Makefile only supports C++, despite Glad being C.
2020-01-15 07:24:33 +00:00
Clownacy
d76b074aa0 Switched from GLEW to GLAD
One less set of license obligations to satisfy (GLAD-generated files
are public-domain).
2020-01-15 07:11:43 +00:00
Clownacy
a0d11aee3c Makefile warning cleanup
The escape character seems to be unneeded.
2019-12-05 16:05:56 +00:00
Clownacy
cb494f8f35 Merge branch 'accurate' into portable 2019-12-05 15:54:55 +00:00
Clownacy
5cb06c9b76 Use $(info instead of echo 2019-12-05 15:53:49 +00:00
Clownacy
fc68b772a8 Merge branch 'accurate' into portable 2019-12-05 15:50:56 +00:00
Clownacy
5985fceaee Indent non-recipe Makefile lines with spaces
Apparently tabs should only be used for recipies
2019-12-05 15:46:38 +00:00
Clownacy
fdae7f89a5 Use $(shell instead of backquotes in the Makefile 2019-12-05 15:40:42 +00:00
Clownacy
b936e1dc00 Un-hardcode the DoConfig Makefile target
Now it too is affected by CXXFLAGS-overriding.

I should probably do something about fltk-config, though.
2019-12-05 15:27:22 +00:00
Clownacy
6a8017dd38 Merge branch 'accurate' into portable 2019-12-05 15:06:06 +00:00
Clownacy
20ed61a1f4 Define NDEBUG in RELEASE builds 2019-12-05 15:04:53 +00:00
Clownacy
5d562806b1 Merge branch 'accurate' into portable 2019-12-05 13:09:52 +00:00
Clownacy
b8c70473dc Make Makefile CXXFLAGS overriding safe
The new mingw-w64-make package on Arch Linux's AUR enables
cross-compiling by overriding the CC, CXXFLAGS, and LDFLAGS
variables, but previously CSE2's Makefile wasn't designed to allow
this, causing it to break. Now, it should work properly.
2019-12-05 12:51:57 +00:00
Clownacy
0ec5d85d56 Merge branch 'accurate' into portable 2019-11-17 18:30:44 +00:00
Clownacy
7e2e2c1406 Add warnings to Makefile, and fix WINDRES 2019-11-17 18:04:20 +00:00
Clownacy
2cc6d1d758 Update warning option names in Makefile 2019-11-02 20:17:21 +00:00
Gabriel Ravier
2706480645 Actually properly fix the Makefile
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 15:53:23 +01:00
Gabriel Ravier
2ced08fe70 Fix Makefile by adding missing ")" in conditional
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-11-01 13:22:00 +01:00
Clownacy
8c8ddd496d Adjust merged commits to suit this branch 2019-10-29 19:04:37 +00:00
Clownacy
18add3466c Merge branch 'accurate' into portable 2019-10-29 19:02:02 +00:00
Clownacy
a25998f113 Add actual dependencies to the .rc file 2019-10-29 18:55:15 +00:00
Clownacy
7f2499243c Add a 'compiling resources' message to Makefile 2019-10-29 18:43:52 +00:00
Gabriel Ravier
44d6dac407 First attempt at making warnings work
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-10-27 20:42:19 +01:00
Clownacy
0b8c49b984 Rename SDL RENDERER options
Been meaning to do this for ages
2019-10-14 22:20:21 +00:00
Clownacy
ddd0c17257 Undo that last edit in this branch
We need these
2019-10-13 01:56:33 +00:00
Clownacy
3bbc0286bc Merge branch 'accurate' into portable 2019-10-13 01:55:54 +00:00
Clownacy
883f5470db Remove leftover bin2h stuff from Makefile 2019-10-13 01:55:40 +00:00
Clownacy
aad7e41ded Remove leftover DoConfig stuff from the Makefile 2019-10-13 01:46:27 +00:00
Clownacy
5838eaba1f Add a FOSS Japanese font
It doesn't seem that great at 320x240, but I don't speak Japanese so
what do I know?
2019-09-27 11:18:26 +00:00
Clownacy
17d2c379cd Restore an old workaround from the original portable branch
This can be removed when MSYS2 stops being garbage, and fixes this
upstream.

See https://github.com/msys2/MINGW-packages/issues/4004
2019-09-20 15:47:02 +00:00
Clownacy
22c967ca3a Add a replication of MSVC2003's rand() algorithm
This actually affects how the game sounds. Seriously, listen to the
dialogue boxes. Now it matches the original.
2019-09-04 19:23:35 +00:00
Clownacy
ae8aeae2ac Restored the new font system 2019-09-04 15:43:28 +00:00
Clownacy
a57f4652ca Allow replacing pkg-config
Seems to be needed for Linux MinGW-w64.
2019-09-04 14:55:47 +00:00
Clownacy
0be5e9ead8 Restored the window icon and custom cursor 2019-09-04 14:39:37 +00:00
Clownacy
2b4b57c6eb Merge branch 'accurate' into portable 2019-09-04 14:11:54 +00:00
Clownacy
3a40e9eb36 Add .exe file extensions to the Makefile
32-bit MinGW-w64 has this stupid thing where the Makefile can't
detect that executable depedencies may end with '.exe', causing it to
regenerate them every time it's ran.
2019-09-04 14:01:51 +00:00
Clownacy
0424c3e275 More portability improvements
Now this actually compile on Linux, but it doesn't run.
2019-09-04 13:51:49 +00:00
Clownacy
4e50046d4b Remove WINDOWS and NONPORTABLE
Now that the portable stuff gets its own branch, these are unneeded
2019-09-04 02:14:15 +01:00
Clownacy
79759145c0 Merge branch 'accurate' into portable 2019-09-04 01:53:58 +01:00