Commit graph

1647 commits

Author SHA1 Message Date
Clownacy
976e2425fc Use native window/taskbar icons on Windows
This used to be a feature before the accurate-portable split, I'm
just restoring it.

Previously, while the EXE itself had a unique icon, the window and
taskbar both used the generic 'small' icon, which the original EXE
only used for the window.

SDL2 gives us a way to assign separate icons to each, but it's a
little clunky: it's Windows-only, requires the icons be in .ico
format, and needs them to be embedded in the EXE as resource files.
Also, for some reason, SDL2 doesn't let us refer to them by name - we
have to use their numerical ID.
2020-01-21 11:27:32 +00:00
Clownacy
ad9e3c3e3b Upscale the window icon
Using a 16x16 icon looks terrible on Raspbian's Pixel desktop (it
upscales with blurry filtering).
2020-01-21 10:54:54 +00:00
Clownacy
be533e2f55 Remove FRAMERATE constant
I don't see the point in it.
2020-01-20 23:54:46 +00:00
Clownacy
d04bd94649 Use SDL_TICKS_PASSED for frame-limiting
This probably works-around overflow
2020-01-20 23:53:41 +00:00
Clownacy
2b34cf7965 Typedef BOOL to bool
Since we're not converting to C anymore, it should be fine to rely
on this standard C++ type.
2020-01-20 23:47:33 +00:00
Clownacy
92e5647f11 More CMake capitalisation 2020-01-20 22:06:52 +00:00
Clownacy
a74bfd4b6d Remove a duplicate lib from OPENGLES2_LIBRARIES 2020-01-20 15:41:54 +00:00
Clownacy
79886f5ae4 Add debug prints for listing SDL2 drivers
These list what video/render/audio backends are available, and which
are currently being used.

SDL2 allows you to choose a specific video/audio driver with the
SDL_VIDEODRIVER and SDL_AUDIODRIVER environment variables,
respectively, but there's no such option for the render driver.
2020-01-20 15:27:05 +00:00
Clownacy
1cf5df2d72 Remove a debug print 2020-01-20 14:49:18 +00:00
Clownacy
767262ed8c Handle a malloc failure better
No memory leak
2020-01-20 14:48:12 +00:00
Clownacy
23eed95ff4 Fix CMake build script not finding FindOpenGLES2.cmake 2020-01-20 14:01:22 +00:00
Clownacy
0423614dca More-efficient OpenGL ES 2.0 font textures 2020-01-20 13:52:50 +00:00
Clownacy
ede541db0a Clean up the OpenGL shaders a bit 2020-01-20 13:51:32 +00:00
Clownacy
4cbc56e272 Add OpenGL ES 2.0 renderer 2020-01-20 13:49:30 +00:00
Clownacy
0352af333b Fix another typo 2020-01-17 11:08:36 +00:00
Clownacy
a40c3d7b1b Perform cleanup when OpenGL's Backend_Init fails 2020-01-17 10:54:49 +00:00
Clownacy
0c9c0115cf Whoops. Fix typo. 2020-01-17 10:54:34 +00:00
Clownacy
22622ae69a Merge branch 'accurate' into portable 2020-01-17 10:37:21 +00:00
Clownacy
6764f17ab9 Added bugfix for StartDirectDraw failure
The original code didn't account for it failing, which leads to
annoying bugs happening whenever it does fail.

Now, the game just closes, like it does with any other init error.
2020-01-17 10:35:43 +00:00
Clownacy
faa96094b4 Use SDL's GetProcAddress function for OpenGL
Also added extra sanity checks
2020-01-17 10:25:18 +00:00
Clownacy
54189c598d Explicitly init SDL2's video subsystem 2020-01-16 16:36:03 +00:00
Clownacy
f0d1706907 Fix SDL2 compilation when path contains a space
https://github.com/microsoft/vcpkg/blob/master/ports/sdl2/fix-space-in-path.patch

Hope this gets fixed upstream. This is a dumb bug.
2020-01-16 15:25:25 +00:00
Clownacy
1c0c88074e Fix Resources.cpp Makefile rule 2020-01-15 18:24:52 +00:00
Clownacy
c5f1725a92 More capitalisation 2020-01-15 08:23:47 +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
1c65eee284 Remove GLEW from the list of dependencies 2020-01-15 08:04:04 +00:00
Clownacy
ec270cf88c Merge branch 'accurate' into portable 2020-01-15 08:03:33 +00:00
Clownacy
48651f0b94 Backport a readme line from the portable branch 2020-01-15 08:02:50 +00:00
Clownacy
9995ccb7cc The Makefile doesn't support MSVC 2020-01-15 08:01:33 +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
a09f73f2ea Specify that WARNINGS enables compiler warnings 2020-01-15 07:46:02 +00:00
Clownacy
a1937b4730 Backport the portable branch's warnings 2020-01-15 07:45:36 +00:00
Clownacy
5a72140a5d Rename glad.cpp back to glad.c 2020-01-15 07:31:35 +00:00
Clownacy
776f01777a Merge branch 'accurate' into portable 2020-01-15 07:28:18 +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
449a09b09e Fix an occational invalid memory read
Stupid floating-point rounding errors. Had to undo a fancy
optimisation to avoid it.
2020-01-09 09:10:24 +00:00
Clownacy
78a066ce75 Note some inaccurate stack frames 2020-01-09 06:58:04 +00:00
Clownacy
c831031ba4 Merge branch 'accurate' into portable 2020-01-09 06:39:34 +00:00
Clownacy
3c7a1b285d Ignore the build folder, and tweak paths 2020-01-09 06:38:14 +00:00
Clownacy
2752deccdf Ignore some more files 2020-01-09 06:36:24 +00:00
Clownacy
35e4c6e766 Mark TSC files as binary, not text 2020-01-09 06:32:10 +00:00
Clownacy
242aa05920 Remove some whitespace 2020-01-09 05:43:05 +00:00
Clownacy
4faf94e951 Add missing #include 2020-01-08 19:12:12 +00:00
Clownacy
9e5406eb39 Merge branch 'accurate' into portable 2020-01-08 13:35:20 +00:00
Clownacy
406087bebb Added a missing #include in Organya.cpp 2020-01-08 13:34:54 +00:00
Clownacy
31adc338e4 Remove a newline that isn't in the accurate branch 2020-01-08 13:34:00 +00:00