Commit graph

113 commits

Author SHA1 Message Date
Clownacy
7a30be8a4a Cleanup, support WINDRES as an environment variable
Also reenabled the Discord stuff even though it worked without those
lines(???)
2020-01-23 13:56:25 +00:00
Clownacy
867af9f090 Add option to the Makefile to enable LTO 2020-01-22 23:34:12 +00:00
Clownacy
727b3eee0d Capitalise 'Clang' 2020-01-15 08:16:57 +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
a1937b4730 Backport the portable branch's warnings 2020-01-15 07:45:36 +00:00
Clownacy
5cb06c9b76 Use $(info instead of echo 2019-12-05 15:53:49 +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
20ed61a1f4 Define NDEBUG in RELEASE builds 2019-12-05 15:04:53 +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
7e2e2c1406 Add warnings to Makefile, and fix WINDRES 2019-11-17 18:04:20 +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
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
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
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
44f3b15348 Move the resource script to where it used to be 2019-09-04 01:47:51 +01:00
Clownacy
4b0584b5b8 Rename 'resources.o' to 'windows_resources.o' 2019-09-02 20:24:34 +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
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
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
Gabriel Ravier
5e129967d8 Changed debug flags from -O0 -g to -Og -g3
-Og is because "It is a better choice than -O0 for producing debuggable code because some compiler passes that collect debug information are disabled at -O0." and for making the code at least optimized a little bit
-g3 is for adding maximum debug information (such as macro information)

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-07 08:34:37 +02: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
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
Gabriel Ravier
d854004463 Added .gitattributes for normalisation and normalized a few sources files to LF (from CRLF)
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-03 12:27:11 +02:00
Clownacy
e2ed9ad950 Okay, forget all that. Generating an output folder was stupid. 2019-04-14 18:25:12 +01:00
Clownacy
5ec9fea302 The build folder is now automatically generated
This way, we don't need to tell everyone who uses the enhanced branch
that they need to copy res/data_en. It also gives the CMake project a
way to bundle everything into a neat little folder.
2019-04-14 03:36:57 +01:00
Clownacy
2b7bda3b4a Some pairity between cmake and Makefile 2019-04-10 01:22:32 +01:00
Clownacy
9c46957227 ...Actually make the RASPBERRY_PI option do something 2019-03-18 21:16:46 +00:00
Clownacy
6744235892 Added our own Shift-JIS to Unicode converter
This removes the dependency on iconv, meaning MSVC2003 should be able to
compile the Japanese build now.
2019-03-11 03:06:41 +00:00
Clownacy
5a9553cb30 Makefile fixes and added link-time optimisation
Noticed the mistakes while compiling with Clang on Arch.
2019-03-02 23:15:08 +00:00
Clownacy
063bfbc71c Fixed some static-related stupidity in the Makefile 2019-02-20 16:13:00 +00:00