Commit graph

128 commits

Author SHA1 Message Date
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
Clownacy
44f3b15348 Move the resource script to where it used to be 2019-09-04 01:47:51 +01:00
Clownacy
51795a0e52 Don't need to link these libraries anymore 2019-09-04 00:55:40 +01:00
Clownacy
73e18b4610 Removed the WINDOWS and NONPORTABLE stuff
Now that all the ASM-accurate stuff is in its own branch, we don't
need these anymore.
2019-09-04 00:54:11 +01:00
Clownacy
5ea356a3bd Weed out a lot of the Windows dependency
Storytime: Cucky's original SDL2 port work involved using SDL2's
threading API to emulate the original WinAPI threading.

I can't be assed with that stuff, so I used the same trick Cucky did
for the Wii port, and hooked Organya up to the SDL2 audio callback.
This actually opens up the possibility for perfectly-synchronised
Organya playback. By that I mean, instead of needing a super
low-latency audio callback, I can have the callback synchronise its
audio mixing with Organya itself. I haven't done it yet, I plan to
soon.
2019-09-04 00:28:23 +01:00
Clownacy
5a9492166d Restored the new SDL2 audio system
While I was at it, I overhauled the thing and found a bunch of
optimisations,
2019-09-03 22:29:57 +01:00
Clownacy
1f3728c177 Restore the new resource file system 2019-09-02 23:32:19 +01:00
Clownacy
fd855ee732 Restore the new renderers 2019-09-02 22:46:36 +01:00
Clownacy
11941e1666 Merge branch 'accurate' into portable 2019-09-02 20:25:01 +01:00
Clownacy
4b0584b5b8 Rename 'resources.o' to 'windows_resources.o' 2019-09-02 20:24:34 +01:00
Clownacy
489036e387 Compile the DoConfig clone 2019-09-02 20:21:45 +01:00
Clownacy
1301ea8797 Replace WinAPI with SDL2 as the windowing system 2019-09-02 20:17:06 +01:00
Clownacy
14f4d5d7a6 Fix Makefile when WINDRES is not defined 2019-09-02 20:01:42 +01:00
Clownacy
023188a1b3 Makefile fixes
I really need to test thing before I commit them.

The library linkage things are because MinGW-w64 on Linux is
case-sensitive.

Unfortunately, Linux windres seems to have a problem with
Windows-style directory separators, so if you try building on Linux,
you'll have to convert CSE2.rc to use forward-slashes. I'd make a
commit that does this, but I'm pretty sure MSVC2003 will just revert
it automatically.
2019-09-02 15:37:11 +00:00
Clownacy
46c59b9389 Use -ggdb3
More debug data than -ggdb
2019-09-02 02:12:25 +01:00
Clownacy
b261616597 Added MinGW-w64 support 2019-09-02 02:08:29 +01:00
Clownacy
940034dc22 Define GLEW_STATIC when creating a static build 2019-08-20 12:43:48 +00:00
Clownacy
3a10bf57cb Fix building the OpenGL3 with the Makefile
Why can't any buildsystems just be good

Like, seriously? Why does pkg-config not have an OpenGL package,
so I don't have to deal with this stupid -lopengl32/-lGL stuff?

...Why isn't there a shim libGL that just maps straight to
opengl32.lib?

Arg
2019-08-11 00:04:11 +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
eb62a80956 Change references to OpenGL 2.1 to 3.2 2019-07-31 22:38:33 +00:00
Clownacy
3973419cef Fix Makefile when building SDLSurface backend 2019-07-31 03:51:18 +00:00
Clownacy
b998719ff1 Update CMakeLists.txt, the Makefile, and the readme 2019-07-24 20:09:27 +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
6c7d49ad50 Added DoConfig to the Makefile 2019-07-16 12:25:22 +00:00
Clownacy
9eaba52caf Actually fix the Makefile
Sorry, couldn't test the last commit because I was on a Windows
machine without MSYS2
2019-07-15 18:08:15 +00:00
Clownacy
8fb3f302a0 Got the Makefile working again, and updated the readme 2019-07-15 17:58:33 +01:00
Clownacy
323e33ed36 Fixes for non-MSVC2003 builds 2019-06-20 20:46:03 +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
73b99b6d78 Makefile cleanup, and improve cross-compilation support
bin2h should run on the host system, not the target
2019-06-08 17:42:12 +00:00