duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1760 commits 1 branch 0 tags 64 MiB
Commit graph

174 commits

Author SHA1 Message Date
Clownacy
03c460a60b Merge branch 'accurate' into portable 2020-03-14 22:10:00 +00:00
Clownacy
84cc01b8f0 Remove LTO from the Makefile 
Can also be done by adding to CXXFLAGS

The CMake one will be kept around because it uses an actual CMake
feature.
 2020-03-14 20:12:33 +00:00
Clownacy
a0f7ce8d9f Merge branch 'accurate' into portable 2020-03-14 20:11:42 +00:00
Clownacy
10fbb05670 Remove some Make/CMake options 
These options would add compiler flags that the user could just pass
on their own with CXXFLAGS/CMAKE_CXX_FLAGS.
 2020-03-14 20:03:42 +00:00
Clownacy
2c831a62ad Add NATIVE_OPTIMIZATIONS to the Makefile 
Must have forgot to add this option here when adding it to the
portable branch
 2020-03-14 19:45:30 +00:00
Clownacy
d57850d937 Fix Windows miniaudio build... again 2020-03-04 21:51:22 +00:00
Clownacy
9af25f7c67 Hopefully fixed miniaudio backend on Windows 
Stupid BOOL type
 2020-03-04 21:02:17 +00:00
Clownacy
156c01e672 Rename RENDERER and AUDIO_BACKEND 
Now they're BACKEND_RENDERER and BACKEND_AUDIO
 2020-02-29 18:33:32 +00:00
Clownacy
72672e142d Makefile/CMakeLists.txt fixes 2020-02-29 18:19:06 +00:00
Clownacy
a943e80b1a Add miniaudio audio backend to Makefile 
Also made the CMake file link the libs miniaudio needs
 2020-02-29 18:19:06 +00:00
Clownacy
e599d02fb1 Added NATIVE_OPTIMIZATIONS option to Makefile 2020-01-29 22:19:47 +00:00
Clownacy
8dd1b05790 Fix compilation with the Makefile 2020-01-26 23:55:17 +00:00
Clownacy
cf8977207e Stop using SDL for .bmp decoding 
Now it uses stb_image instead
 2020-01-26 19:47:50 +00:00
Clownacy
26475dacdf Merge branch 'accurate' into portable 2020-01-24 13:56:12 +00:00
Clownacy
917d69fc4a Move the data folder back to the game folder 
The whole 'copy data folder from assets folder to the game folder
when Makefile is ran' thing just made modding annoying.
 2020-01-24 13:44:57 +00:00
Clownacy
441fe2faed Merge branch 'accurate' into portable 2020-01-23 14:39:55 +00:00
Clownacy
7a30be8a4a Cleanup, support WINDRES as an environment variable 
Also reenabled the Discord stuff even though it worked without those
lines(???)
 2020-01-23 13:56:25 +00:00
Clownacy
b274c3af6a Fix window icon in Windows builds 2020-01-23 12:29:22 +00:00
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