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
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