Commit graph

180 commits

Author SHA1 Message Date
Clownacy
0b8c49b984 Rename SDL RENDERER options
Been meaning to do this for ages
2019-10-14 22:20:21 +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
Gabriel Ravier
c9b248ba64
Removed space before ':' and re-added comma before or
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 19:01:36 +02:00
Gabriel Ravier
dd190bd276
Remove option change, wrote "cross-gcc" as "cross-GCC" and "mingw" as "MinGW"
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 14:32:48 +02:00
Gabriel Ravier
d686152e84
Fixed question not being a question, "Emscriptem" and saying "cross-compiled" twice
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 14:11:01 +02:00
Gabriel Ravier
7176bcab9e
Added more detail to the cross-compile comment
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 13:37:34 +02:00
Gabriel Ravier
a9f95ed1a2
Changed some comments and messages in CMakeLists.txt
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 08:24:00 +02:00
Clownacy
c60cdb3610 Make CMake detect static SDL2 installations
Fixes #46
2019-09-10 12:23:09 +00:00
Clownacy
b5f2fa8693 Add a DEBUG_SAVE option to CMakeLists.txt 2019-09-06 21:24:54 +01:00
Clownacy
b53741ca25 Fix CMakeLists.txt some more 2019-09-06 19:59:44 +01:00
Clownacy
9f40c68ab2 Repair CMakeLists.txt 2019-09-06 19:27:32 +00:00
Clownacy
e6350151c9 Revert "Remove the leftover CMakeLists.txt file"
This reverts commit c7c5077103.

It probably doesn't work anymore, but I plan to get it working again
in this branch.
2019-09-05 12:48:46 +00:00
Clownacy
c7c5077103 Remove the leftover CMakeLists.txt file
I might bring this back at some point. Depends.
2019-09-05 12:46:39 +00:00
Clownacy
ea83d4ba8a Merge branch 'master' into accurate 2019-08-25 20:35:01 +01:00
Clownacy
c4599bc146 Allow third-party in-source files to go in the external folder 2019-08-10 22:47:40 +01:00
Clownacy
cdbcd5f6c3 Added a local copy of GLEW 2019-08-10 21:47:06 +01:00
Clownacy
fc0653e5aa Back to OpenGL 3.2 (I really want the core profile)
In OpenGL 3.1, compatibility mode was an extension, meaning it could
never actually be disabled. 3.2 fixed that with the introduction of
profiles.
2019-08-10 18:05:01 +01:00
Clownacy
7146288e94 Sod it, fall back on compatibility mode if it's available
This way, I can use immediate mode, which is way faster than using
buffers for some reason. Since I'm not using profiles anymore, I
dropped the minimum requirement to OpenGL 3.1. If a driver doesn't
support Legacy GL, then it can use the slow buffer code.

But seriously, I need to figure out why using buffers is so slow.
If this was a common problem, Modern OpenGL wouldn't have made it the
only option.
2019-08-09 19:19:43 +01:00
Clownacy
eb62a80956 Change references to OpenGL 2.1 to 3.2 2019-07-31 22:38:33 +00:00
Clownacy
348a691c6c GLU is unneeded 2019-07-31 02:49:07 +00:00
Clownacy
b998719ff1 Update CMakeLists.txt, the Makefile, and the readme 2019-07-24 20:09:27 +01:00
Clownacy
05f382961d Added OpenGL 2.1 renderer
Yay 100% hardware-acceleration. Yes, I know 2.1 is outdated and
crappy, but it was the easiest one to write. I'll probably make an
OpenGL 3.0 Core renderer at some point.

Anyway, font rendering isn't here yet, because I plan to overhaul it.
2019-07-23 15:20:14 +01:00
Clownacy
44456e4a25 Add an SDL_Surface-based renderer
Ha, my custom software renderer is faster!
2019-07-17 16:09:18 +01:00
Clownacy
b84661d88a Move the backend files around a bit 2019-07-15 17:01:42 +01:00
Clownacy
15bfd00d25 Added hardware-accelerated rendering backend
Still need to add the code for surviving render target losses
2019-07-15 16:47:10 +01:00
Clownacy
21cf78b86d Split Draw.cpp into common code and backend code
Should be easy to add the new hardware renderer now
2019-07-15 13:42:49 +01:00
Clownacy
974865e2d2 Add some Windows-only Generic.cpp functions
These things are annoying. I really need to split this repo into
accurate and portable branches soon.
2019-07-03 11:22:40 +01:00
Clownacy
31196e15ec CMake fixes
This fixes Ninja support, fixes Visual Studio debug builds, and
fixes Windows builds.
2019-06-21 02:45:16 +01:00
Clownacy
49defcc3fb Now the build output directory is generated completely
The data folder is now stored in the new assets folder, and copied
across as part of the build process.
2019-06-17 19:13:29 +00:00
Clownacy
e9c42c6c30 Put back those dashes removed in the last commit
Whitespace selection apparently selects more than whitespace.
Thanks, Geany.
2019-06-16 20:29:38 +00:00
Clownacy
3f36bf52de CMake formatting cleanup 2019-06-16 19:36:59 +00:00
Clownacy
75f585a727 Made CMakeLists.txt cross-compile-friendly
bin2h is built natively
2019-06-08 18:27:57 +00:00
Clownacy
50897e8ceb Move DoConfig_debug naming to the root CMakeLists.txt 2019-05-23 21:29:32 +01:00
Clownacy
5b89a31976 Split bin2h to its own CMake file
Also added warnings to its part of the Makefile
2019-05-23 19:42:52 +01:00
Clownacy
7db42b0b72 Set bin2h to C90 in the CMake file
Done to match the Makefile
2019-05-23 11:36:41 +00:00
Clownacy
609d54916b Renamed debug builds to 'CSE2_debug' and 'DoConfig_debug'
Makes a bit more sense than 'CSE2d' and 'DoConfigd'
2019-05-22 00:29:16 +00:00
Clownacy
e925880f5b Fixed VS 2017 WinXP builds when using local libs
Turns out vcpkg enables this for its build too.
2019-05-08 15:06:51 +01:00
Clownacy
6ef6f0f5c0 Tweak how FORCE_LOCAL_LIBS works 2019-05-05 14:19:40 +01:00
Clownacy
a6ac6787d3 Embed the fonts in the EXE
Now CSE2.exe should be drop-in replacement for Doukutsu.exe, with
no extra files needed.
2019-05-05 14:03:16 +01:00
Clownacy
6dc85875ff Changed output executable naming scheme
Now the Makefile and CMake build systems are identical:

Release builds are named CSE2, and debug builds are named CSE2d.

Language no longer has an effect on filename for the Makefile.
2019-05-05 03:14:58 +01:00
Clownacy
36119082d2 Remove CMAKE_BUILD_TYPE defaulting
It's annoying, but vcpkg *really* didn't agree with it (it would just
build Debug anyway). The instructions provided with the repo already
tell you to manually define Release builds anyway.
2019-05-05 02:55:54 +01:00
Clownacy
ddf61dd791 Added Wave.dat's original file extension
beebd77d73/source/Sound.cpp (L477)

Thank goodness for the Org2 source release
2019-05-05 02:20:37 +01:00
Clownacy
d2f1b2c1a9 Renamed some of the resource files
The Linux port's get_resource function seems to be using the original
filenames, rather than the 8.3 filenames used by the Windows EXE's
resource system. Too bad it doesn't tell us the original file extensions.
2019-05-04 18:26:41 +01:00
Clownacy
6288ec0355 Made DoConfig self-contained 2019-05-02 18:20:47 +01:00
Clownacy
5c339ef686 ...Static-link MSVC CRT properly 2019-04-29 23:21:52 +01:00
Clownacy
12b6fad997 Made MSVC static-link the CRT 2019-04-29 22:11:47 +01:00
Clownacy
fdb2177879 Add missing options to the readme 2019-04-29 14:36:18 +01:00
Clownacy
58d7fb2ca7 Some more CMake fixes 2019-04-26 05:13:50 +01:00
Clownacy
469c25c93d Added FORCE_LOCAL_LIBS option
This forces CMake to use the local libraries, even if system libs
are readily available. This is useful for MSYS2, since find_package
would link dynamic libraries, but local libraries are static.
2019-04-26 04:17:29 +01:00
Clownacy
5272861330 Remove leftover debug print 2019-04-26 03:42:36 +01:00