Commit graph

528 commits

Author SHA1 Message Date
Clownacy
2c9d04d439 Point out that dependencies will be built if they're not present 2019-05-05 15:00:50 +01:00
Clownacy
f60e5cbf47
Merge pull request #9 from GabrielRavier/correctGitIgnore
Correct errors in .gitignore
2019-05-05 13:48:11 +00:00
Clownacy
6ef6f0f5c0 Tweak how FORCE_LOCAL_LIBS works 2019-05-05 14:19:40 +01:00
Clownacy
ef8618d446 .gitignore the converted resource files 2019-05-05 14:09:18 +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
Gabriel Ravier
b3cb19f70c Slight comment correction
"direcory" to "directory"
Add "Include" note to be consistent (for exclusions)

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-05 14:43:42 +02:00
Clownacy
1f179f9287 Remove some clutter from the .gitignore
Only Cucky ever used this
2019-05-05 03:20:11 +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
1d064204d5 This #include is needless 2019-05-05 02:38:38 +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
f7c1ca86c3 Remove Resource.cpp's dependence on SDL2
This also makes its API a lot more similar to Windows'
2019-05-05 01:57:23 +01:00
Clownacy
58a3974e1a Added an accuracy improvement
It affects portability though, so it's hidden behind the NONPORTABLE
flag.
2019-05-04 21:39:16 +00:00
Clownacy
dc0f242f25 Made clamp macro safer 2019-05-04 21:37:06 +00: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
b83365f09b
Merge pull request #4 from GabrielRavier/autoNormalizeLineEndings
Automatically normalize line endings
2019-05-03 13:37:20 +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
Gabriel Ravier
94ed000beb
Merge pull request #4 from Clownacy/master
Merge Clownacy/master into master
2019-05-03 11:56:49 +02:00
Clownacy
c52004a1b3 Add a missing #include 2019-05-03 01:40:52 +01:00
Gabriel Ravier
b1891fbf2d
Merge pull request #3 from Clownacy/master
Merge Clownacy/master into master
2019-05-02 21:23:12 +02:00
Clownacy
d79c50f8d8
Merge pull request #3 from GabrielRavier/AddVSCodeToGitIgnore
Added VSCode support to .gitignore
2019-05-02 19:44:21 +01:00
Clownacy
176da4977d
Merge pull request #2 from GabrielRavier/imgbot
Optimize images (ImgBot)
2019-05-02 19:44:06 +01:00
Gabriel Ravier
0329c89f1d
Merge pull request #2 from Clownacy/master
Merge Clownacy/master into master
2019-05-02 20:04:19 +02:00
Gabriel Ravier
367834b290 Undid changes to external images
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-02 19:27:30 +02:00
Clownacy
6288ec0355 Made DoConfig self-contained 2019-05-02 18:20:47 +01:00
Gabriel Ravier
c697a9b8b2 Corrected unclear comment 2019-05-02 19:02:01 +02:00
Clownacy
8270bb58fc
Merge pull request #1 from GabrielRavier/AddBuildDirsToGitIgnore
Edited .gitignore to filter out build directories and added some general documentation
2019-05-02 17:19:08 +01:00
Gabriel Ravier
ef4a4ef43b Removed redundantly excluded files in .gitignore
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-02 18:08:49 +02:00
Gabriel Ravier
1b15898c6a Added "release", "debug", "releasejp" and "debugjp" to list of
filtered-out executables
2019-05-02 17:00:43 +02:00
Gabriel Ravier
92dedc64c5 Made .gitignore ignore only specific executable files instead of
filtering out all files without extensions
2019-05-02 16:33:33 +02:00
Clownacy
a3022e701a
Fix stupid grammar error in .gitignore
Co-Authored-By: GabrielRavier <31440290+GabrielRavier@users.noreply.github.com>
2019-05-02 16:27:09 +02:00
Gabriel Ravier
4cd09e7990 Added VSCode support to .gitignore 2019-05-02 16:21:55 +02:00
Gabriel Ravier
209bbfe13c Edited .gitignore to filter out build directories and added some general documentation
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-05-02 14:22:31 +02:00
ImgBotApp
554e082430
[ImgBot] Optimize images
*Total -- 1,272.24kb -> 1,097.97kb (13.7%)

/external/fltk/test/desktop/sudoku-128.png -- 6.36kb -> 2.34kb (63.19%)
/screenshot.png -- 8.74kb -> 3.58kb (58.98%)
/external/fltk/documentation/src/positioner.png -- 0.98kb -> 0.41kb (58.51%)
/external/fltk/documentation/src/tree-dimensions.png -- 5.06kb -> 2.63kb (48.07%)
/external/fltk/documentation/src/Fl_Check_Button.png -- 1.61kb -> 0.89kb (44.55%)
/external/fltk/documentation/src/symbols.png -- 78.24kb -> 45.52kb (41.82%)
/external/fltk/documentation/src/tabs_uniform.png -- 1.17kb -> 0.68kb (41.78%)
/external/fltk/documentation/src/Fl_Spinner.png -- 10.63kb -> 6.27kb (41.03%)
/external/fltk/documentation/src/Fl_Roller.png -- 1.14kb -> 0.73kb (36.16%)
/external/fltk/documentation/src/tabs_selection.png -- 1.10kb -> 0.71kb (35.14%)
/external/fltk/test/desktop/blocks-128.png -- 15.85kb -> 10.39kb (34.47%)
/external/fltk/documentation/src/text.png -- 1.77kb -> 1.16kb (34.44%)
/external/fltk/fluid/icons/fluid-256.png -- 23.23kb -> 15.25kb (34.35%)
/external/fltk/documentation/src/fluid-org.png -- 26.93kb -> 18.14kb (32.66%)
/external/fltk/documentation/src/tabs_default.png -- 1.03kb -> 0.70kb (32.35%)
/external/fltk/documentation/src/tabs.png -- 1.54kb -> 1.07kb (30.82%)
/external/fltk/fluid/icons/fluid-128.png -- 9.94kb -> 7.05kb (29.08%)
/external/fltk/documentation/src/scrollbar.png -- 1.01kb -> 0.73kb (28.35%)
/external/fltk/documentation/src/adjuster1.png -- 1.06kb -> 0.77kb (27.61%)
/external/fltk/test/desktop/checkers-32.png -- 1.83kb -> 1.33kb (27.37%)
/external/fltk/documentation/src/counter.png -- 1.27kb -> 0.94kb (26.36%)
/external/fltk/documentation/src/editor-linenumbers.png -- 54.76kb -> 41.79kb (23.69%)
/external/fltk/documentation/src/Fl_Tile.png -- 8.25kb -> 6.84kb (17.18%)
/external/fltk/fluid/icons/fluid-64.png -- 3.85kb -> 3.24kb (15.88%)
/external/SDL2/VisualC-WinRT/tests/testthread/Assets/SplashScreen.png -- 2.10kb -> 1.77kb (15.52%)
/external/SDL2/VisualC-WinRT/tests/loopwave/Assets/SplashScreen.png -- 2.10kb -> 1.77kb (15.52%)
/external/fltk/misc/MacRoman_utf-8.png -- 102.95kb -> 89.29kb (13.27%)
/external/fltk/documentation/src/Fl_Value_Output.png -- 0.56kb -> 0.49kb (12.74%)
/external/fltk/documentation/src/Fl_Value_Input.png -- 0.53kb -> 0.46kb (12.59%)
/external/fltk/documentation/src/Fl_File_Input.png -- 3.04kb -> 2.66kb (12.47%)
/external/fltk/documentation/src/charts.png -- 6.50kb -> 5.70kb (12.39%)
/external/fltk/misc/cp1252.png -- 94.65kb -> 83.23kb (12.07%)
/external/fltk/documentation/src/fluid2.png -- 15.50kb -> 13.74kb (11.35%)
/external/fltk/documentation/src/fluid1.png -- 3.73kb -> 3.32kb (10.84%)
/external/SDL2/Xcode-iOS/Template/SDL iOS Application/Default-568h@2x.png -- 81.83kb -> 73.16kb (10.59%)
/external/fltk/fluid/icons/fluid-48.png -- 2.70kb -> 2.42kb (10.35%)
/external/fltk/documentation/src/Fl_Round_Button.png -- 0.51kb -> 0.46kb (10.27%)
/external/fltk/documentation/src/FL200.png -- 2.56kb -> 2.32kb (9.67%)
/external/fltk/documentation/src/FL.png -- 5.51kb -> 4.99kb (9.5%)
/external/fltk/documentation/src/fluid-gettext.png -- 4.27kb -> 3.89kb (8.72%)
/external/fltk/documentation/src/boxtypes.png -- 6.60kb -> 6.04kb (8.46%)
/external/fltk/documentation/src/fluid_widget_style.png -- 3.99kb -> 3.66kb (8.39%)
/external/fltk/documentation/src/fluid-catgets.png -- 4.24kb -> 3.90kb (8.08%)
/external/fltk/documentation/src/fluid_widget_cxx.png -- 4.20kb -> 3.86kb (8.05%)
/external/fltk/documentation/src/editor.png -- 8.62kb -> 7.93kb (7.93%)
/external/fltk/documentation/src/fluid3-style.png -- 4.25kb -> 3.92kb (7.92%)
/external/fltk/documentation/src/fluid3-gui.png -- 5.46kb -> 5.03kb (7.87%)
/external/fltk/documentation/src/fluid_widget_gui.png -- 5.27kb -> 4.88kb (7.49%)
/external/fltk/documentation/src/fluid4.png -- 3.40kb -> 3.15kb (7.44%)
/external/fltk/documentation/src/fluid3-cxx.png -- 4.55kb -> 4.22kb (7.32%)
/external/fltk/documentation/src/fltk-colormap.png -- 51.79kb -> 48.20kb (6.93%)
/external/fltk/documentation/src/Fl_Native_File_Chooser.png -- 400.89kb -> 373.24kb (6.9%)
/external/fltk/documentation/src/Fl_Return_Button.png -- 0.50kb -> 0.47kb (6.77%)
/external/fltk/documentation/src/Fl_Help_Dialog.png -- 4.89kb -> 4.59kb (6.15%)
/external/fltk/test/desktop/blocks-32.png -- 1.81kb -> 1.70kb (6.14%)
/external/fltk/documentation/src/cubeview.png -- 4.38kb -> 4.13kb (5.69%)
/external/fltk/documentation/src/Fl_Light_Button.png -- 0.45kb -> 0.42kb (5.69%)
/external/fltk/documentation/src/Fl_Tree_Item-dimensions.png -- 62.84kb -> 59.27kb (5.68%)
/external/fltk/documentation/src/buttons.png -- 1.35kb -> 1.29kb (4.34%)
/external/fltk/fluid/icons/fluid-32.png -- 1.55kb -> 1.50kb (3.02%)
/external/fltk/documentation/src/Fl_Scroll.png -- 5.61kb -> 5.45kb (2.92%)
/external/fltk/documentation/src/table-as-container.png -- 10.04kb -> 9.76kb (2.74%)
/external/fltk/documentation/src/tree-elements.png -- 14.08kb -> 13.80kb (2%)
/external/fltk/documentation/src/table-simple.png -- 9.40kb -> 9.24kb (1.71%)
/external/fltk/documentation/src/valuators.png -- 6.75kb -> 6.67kb (1.17%)
/external/fltk/documentation/src/hello_cxx.png -- 1.17kb -> 1.16kb (0.92%)
/external/fltk/documentation/src/menu.png -- 2.01kb -> 2.00kb (0.68%)
/external/fltk/documentation/src/fl_color_chooser.jpg -- 7.51kb -> 7.49kb (0.32%)
/external/fltk/documentation/src/table-dimensions.png -- 2.30kb -> 2.30kb (0.13%)
/external/SDL2/Xcode-iOS/Demos/Default.png -- 17.95kb -> 17.94kb (0.05%)
/external/SDL2/Xcode-iOS/Template/SDL iOS Application/Default.png -- 17.95kb -> 17.94kb (0.05%)
2019-05-02 11:25:59 +00:00
Clownacy
95e5e859a3 Remove pkg-config from the readme's list of dependencies
It only applies to the Makefile
2019-04-30 12:59:50 +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
b04e9ee11a .gitignore cleanup 2019-04-29 15:44:56 +01:00
Clownacy
9168a29f28 Remove unused SDL2 lib 2019-04-29 15:33:57 +01:00
Clownacy
75af33b7ed Remove unused MSVC files
Now that CMake compiles these dependencies directly, there's no need
to keep pre-built libraries around, except for MSVC2003.
2019-04-29 15:06:02 +01:00
Clownacy
079681a9d7 Added devilution-comparer files
I've kept these local for ages, but they're probably useful to have
upstream too
2019-04-29 14:49:13 +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
6209661c76 Fixed SDL2 exporting DLL symbols in static builds 2019-04-26 03:42:57 +01:00
Clownacy
5272861330 Remove leftover debug print 2019-04-26 03:42:36 +01:00
Clownacy
0e99e77337 Enabled subpixel rendering in the local copy of FreeType
This makes the text resemble the ClearType text rendered by Windows
in the vanilla game.
2019-04-26 02:54:30 +01:00
Clownacy
896b09f336 Fixed some CMake problems that were preventing builds on Windows
FLTK kinda sucks
2019-04-26 02:50:23 +01:00
Clownacy
ac465d29b4 Mean CMake dependency overhaul
I'm taking a page from Dolphin's book, and including copies of each
dependency's source code. This combines the ease of use of including
pre-built libraries instead of needing to navigate a package manager
 - as is (or was) the case for MSVC - with the portability of using
packages. Granted, this method's more of a jack of all trades,
master of none, since it's *less* user-friendly than prebuilt
packages (compilation times), and you don't get the per-distro
compatibility fixes you'd get from a package manager.

You can still use system libs if you want. In fact, it's still the
default behaviour: compiling the libs manually is just a fallback.
I'll add an option to force-enable this soon, however, since it's a
nicer way to produce static MSYS2 builds than the hackish nightmare
that I was using before. Not to mention, having my own copy of the
sources means I can provide my own fixes and tweaks your package
manager may not. For example, I can combine MSYS2's FreeType
subpixel rendering with vcpkg's fix for SDL2 exporting its symbols
in static builds.
2019-04-26 01:52:02 +01:00
Clownacy
7d222231ae Added some missing headers 2019-04-26 01:41:36 +01:00