Commit graph

1797 commits

Author SHA1 Message Date
Clownacy
3a5a5044b1 Split SDL2 code from Main.cpp 2020-03-31 16:07:34 +01:00
Clownacy
51562f6fd8 Use standard main return values
`WinMain` has weird rules for this, and they don't match `main`.
2020-03-31 15:37:51 +01:00
Clownacy
9a598b1359 Bump Makefile to C++11, to match CMake 2020-03-31 14:28:23 +01:00
Clownacy
d0b20316de Don't do -Iexternal
It pollutes the #include space.
2020-03-31 14:26:24 +01:00
Clownacy
72df8728cf Update miniaudio to v0.10.2 2020-03-31 14:14:56 +01:00
Clownacy
1b61aec51f Fix Makefile 2020-03-31 14:12:57 +01:00
Clownacy
b8de1cb5db Merge branch 'accurate' into portable 2020-03-31 14:07:21 +01:00
Clownacy
61e708751d Apply missing OpenGL constants 2020-03-31 12:53:58 +01:00
Clownacy
424edc5256 Add header file to CMake file as well 2020-03-31 12:20:39 +01:00
Clownacy
d91c1e9bdc Update the SDL2 audio backend
Now uses the shared software mixer
2020-03-31 12:19:44 +01:00
Clownacy
732d3bbc5c Split software audio mixer to its own file
This will be shared between the SDL2 and miniaudio backends,
eliminating all that digusting duplicate code.
2020-03-31 12:14:20 +01:00
Clownacy
4e58457e1d Make miniaudio backend use native sample rate
This avoids the need for miniaudio to resample the mixer's output.
2020-03-31 10:20:20 +01:00
Clownacy
ca6538561f Document ActNpc061 (King) 2020-03-27 17:49:58 +00:00
Clownacy
db1b1d80f8 Disable Windows Travis builds for now
Really not in the mood to deal with that damn mess. Maybe if the
bloody thing could be arsed to print an error or two, I'd know what's
wrong, but nope. Works fine on a regular MSYS2 installation, so sod
it.
2020-03-22 16:19:43 +00:00
Clownacy
7820926bfd Remove outdated comments 2020-03-22 15:37:00 +00:00
Clownacy
c34a7fc354 Fix build error 2020-03-22 15:35:59 +00:00
Clownacy
b374a8046c Add some missing global/static variable names
Also from the Mac port.
2020-03-22 15:31:28 +00:00
Clownacy
f6606b7748 Add some missing function names
These were retrieved from the Mac port (v0.0.7), which kept these
functions.

Unfortunately, this port is missing local variable names, so we can't
use it to make InitBack accurate.
2020-03-22 15:31:28 +00:00
Clownacy
d707ce9f91
Merge pull request #106 from GabrielRavier/fixWNarrowing
Backends/Rendering/SDLTexture: Solve -Wnarrowing warning
2020-03-18 12:03:17 +00:00
Gabriel Ravier
fb353fbc7e Backends/Rendering/SDLTexture: Solve -Wnarrowing warning
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2020-03-18 11:54:46 +01:00
Clownacy
cf75cbcad2 Don't embed font in executable
Creating a Japanese build would require 4GB+ of RAM because of this.
It's about time it got removed. It was a silly idea anyway.
2020-03-17 21:14:15 +00:00
Clownacy
b199feb944 Merge branch 'accurate' into portable 2020-03-17 19:22:42 +00:00
Clownacy
ec97ae4805 Fix typo in readme 2020-03-17 19:21:41 +00:00
Clownacy
dd04977f29 Update miniaudio to v0.10.1
This newer version supports marking all of its declarations as
static, avoiding the conflict between the miniaudio audio backend,
and the copy of miniaudio embedded in clownaudio in the enhanced
branch.
2020-03-17 13:25:41 +00:00
Clownacy
61aec1cb15 Use native Windows types/macros when available
This prevents conflicts when a translation unit includes
`WindowsWrapper.h`, and middleware that includes `windows.h`.
2020-03-17 13:21:37 +00:00
Clownacy
44762363cf Bump required C++ standard to C++11
cute_spritebatch.h uses C99/C++11 features.
2020-03-15 00:06:30 +00:00
Clownacy
cc4a58fbac Use CFLAGS and CMAKE_C_FLAGS 2020-03-14 23:18:30 +00:00
Clownacy
4f49fe8706 Merge branch 'accurate' into portable 2020-03-14 23:17:42 +00:00
Clownacy
7fe29e6ac5 List technical options after game-affecting ones 2020-03-14 23:12:27 +00:00
Clownacy
d54bc4c232 Add MSVC_LINK_STATIC_RUNTIME to the readme 2020-03-14 23:09:05 +00:00
Clownacy
066f4988d3 CMake cleanup 2020-03-14 23:03:47 +00:00
Clownacy
720466826b Merge branch 'accurate' into portable 2020-03-14 23:01:46 +00:00
Clownacy
36f961d328 Fix CMake build with Linux MinGW-w64 2020-03-14 23:01:27 +00:00
Clownacy
3e581b0489 Specify which type of SDL2 is being used
It seems that SDL 2.0.12 improved its autotools-generated CMake file,
to the point where our script mistakes it for a CMake-generated one.
2020-03-14 22:55:01 +00:00
Clownacy
7420594241 Make Travis file use CXXFLAGS/CMAKE_CXX_FLAGS 2020-03-14 22:53:08 +00:00
Clownacy
7d4fda54ef Fix errors 2020-03-14 22:50:04 +00:00
Clownacy
b84601cceb Update DoConfig and bin2h CMake files 2020-03-14 22:41:14 +00:00
Clownacy
03c460a60b Merge branch 'accurate' into portable 2020-03-14 22:10:00 +00:00
Clownacy
e96619141b Update Travis file to use CXXFLAGS 2020-03-14 22:02:06 +00:00
Clownacy
4ef83526c0 More CMake cleanup 2020-03-14 21:59:42 +00:00
Clownacy
cadfeab385 Neaten-up the CMake file 2020-03-14 20:26:59 +00:00
Clownacy
216aec7caf Clean-up CMake LTO
Honestly, considering the user can enable LTO by setting
CMAKE_INTERPROCEDURAL_OPTIMIZATION, I might remove this option too...
2020-03-14 20:19:48 +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
bbf65f64f5 Note that users can pass their own compiler flags 2020-03-14 19:59:56 +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
a70b4e444e Add CMake info to the readme 2020-03-14 19:42:58 +00:00
Clownacy
efa987d7ad Make the static MSVC runtime linkage optional
I'd tell people to use CMAKE_MSVC_RUNTIME_LIBRARY instead, but, eh,
it's too recent.
2020-03-14 19:36:47 +00:00
Clownacy
505c9cc8f5 Clean-up MSVC tweaks 2020-03-14 19:30:57 +00:00