Commit graph

65 commits

Author SHA1 Message Date
Clownacy
9c056f6882 Add option to make DoConfig clone use OpenGL 2.1
This way, I can use it in my Windows 7 VM, where OpenGL 3.2 isn't
available.
2020-07-08 19:33:58 +01:00
Clownacy
cebd07a939 Update imgui to latest table branch commit 2020-07-08 19:33:55 +01:00
Gabriel Ravier
b52a343760 CMakeLists: Fix CMP0072 warning
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2020-05-01 00:13:22 +02:00
Gabriel Ravier
8f4ef85cf8 CMakeLists: Add CMake 3.8 support
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2020-04-17 19:48:12 +02:00
Gabriel Ravier
99d4a6fbd4 CMakeLists: Added support for CMake 3.10.2
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2020-04-16 11:20:53 +02:00
Clownacy
0aa65f7cd3 Fix pkg-config static linking
For some reason, [LIB]_STATIC_LINK_LIBRARIES is blank. Thanks a lot,
CMake.
2020-04-05 16:58:52 +01:00
Clownacy
dded47f921 Cleanup 2020-04-03 02:00:51 +01:00
Clownacy
f45758e845 Add missing dependencies 2020-04-03 01:52:54 +01:00
Clownacy
5b996b3459 Give glad a CMake file
Today I learned that CMake will error if the project shares a
dependency with a nested CMake file (which could be from an
entirely-separate project that you have no control over).

I'm starting to really hate CMake.
2020-04-03 01:34:47 +01:00
Clownacy
2b65c5811a Merge branch 'portable' of https://github.com/Clownacy/Cave-Story-Engine-2 into portable 2020-04-02 23:18:44 +01:00
Clownacy
0846a1b3b9 Make DoConfig icon appear in window on Windows 2020-04-02 22:14:55 +01:00
Clownacy
54797a05f8 Do not create imgui.ini 2020-04-02 22:14:36 +01:00
Clownacy
3f4bbc2c5d Add some options to DoConfig's CMake 2020-04-02 22:18:46 +01:00
Clownacy
ae84148092 Shut-up Clang warning 2020-04-02 21:33:36 +01:00
Clownacy
53d54d4e53 Ignore argc, don't ignore argv 2020-04-02 20:58:01 +01:00
Clownacy
7d30407206 Use LINK_LIBRARIES instead of LIBRARIES
macOS Travis complains about not finding -lSDL2, so use absolute
paths instead.
2020-04-02 20:57:16 +01:00
Clownacy
0082b7c37f Remove junk file 2020-04-02 20:15:39 +01:00
Clownacy
76bb17dc01 Allow the new DoConfig to link local GLFW3 2020-04-02 20:12:21 +01:00
Clownacy
69e0a17e90 Fix DoConfig for its new location 2020-04-02 19:59:06 +01:00
Clownacy
c9dbc5607e Delete old DoConfig 2020-04-02 19:58:03 +01:00
Clownacy
aa0f5b153e Cleanup and fixes 2020-04-02 19:56:42 +01:00
Clownacy
d9eade8944 Get the new DoConfig to read/write Config.dat 2020-04-02 18:36:07 +01:00
Clownacy
f5113f8639 Add new work-in-progress DoConfig
This is built upon GLFW, OpenGL3, and Dear ImGui, removing FLTK as a
dependency.
2020-04-02 17:57:42 +01:00
Clownacy
1839370ae9 More warnings 2020-04-02 00:29:57 +01:00
Clownacy
7d4fda54ef Fix errors 2020-03-14 22:50:04 +00:00
Clownacy
b84601cceb Update DoConfig and bin2h CMake files 2020-03-14 22:41:14 +00:00
Clownacy
14735caac3 Mark CMake target thingies as private 2020-02-29 18:19:06 +00:00
Clownacy
f1740a2c5e Add native-optimisations and LTO to DoConfig and bin2h
Forgot bin2h even had a CMake file
2020-01-30 01:19:45 +00:00
Clownacy
413fe560e4 Add LTO toggle to DoConfig CMakeLists.txt 2020-01-23 01:00:07 +00:00
Clownacy
c45e888b74 Improve CMake style consistency 2020-01-23 00:59:27 +00:00
Clownacy
92e5647f11 More CMake capitalisation 2020-01-20 22:06:52 +00:00
Clownacy
5d12071f17 Make DoConfig check Config.dat's magic number
Fixes #88

The issue was caused by Config.dat reading a CSE2E Config.dat, and
preserving its altered magic number, which Cave Story would reject,
causing it to fallback on default settings.
2020-01-06 16:38:47 +00:00
Clownacy
b14e0939a9 Shut up some Clang warnings in DoConfig 2019-10-29 12:08:47 +00:00
Clownacy
22f737e139 Add WARNING 'option's to bin2h and DoConfig 2019-10-29 11:54:08 +00:00
Clownacy
404d748da7 Rename ALL_WARNINGS and FATAL_WARNINGS
This way, all three options appear neatly together when 'cmake -LH'
is ran.
2019-10-29 11:53:02 +00:00
Clownacy
68fceb63c4
Merge pull request #63 from GabrielRavier/addWarnings2
Add warnings
2019-10-29 11:44:13 +00:00
Gabriel Ravier
d40376ff35 Removed bin2h mentions in CMakeLists, moved warnings options and FORCE_LOCAL_LIBS into a seperate block where the descriptions were improved and added warnings to DoConfig
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-10-29 10:03:13 +01:00
Clownacy
4e99c97fee
Merge pull request #64 from GabrielRavier/fixMSVCUtf8
Make MSVC recognize source files as UTF-8
2019-10-28 19:00:17 +00:00
Gabriel Ravier
94442d9ce3 Made it so MSVC interprets source files as UTF-8 to fix compile
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-10-28 18:22:31 +01:00
Clownacy
15ad469f67 Shut up that CMake OpenGL warning
What's so hard about CMake *just working*? Why do I have to jump
through all these stupid hoops?
2019-10-27 18:20:44 +00:00
Clownacy
5c040608cb
Merge pull request #53 from GabrielRavier/betterCMakeMessages
Improve some comments and the option message for the renderer in the CMakeLists.txts
2019-09-11 18:03:37 +01:00
Clownacy
8e8f18a1ee Having second thoughts about this style change 2019-09-11 13:07:55 +00:00
Gabriel Ravier
b10d895334
Changed public-private indentation
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 12:02:57 +02:00
Gabriel Ravier
69cb6b75c7
Reformatted DoConfig
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 11:49:58 +02:00
Gabriel Ravier
2b2db48588
Some slight formatting
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 09:35:50 +02:00
Gabriel Ravier
47fbf3ece7
Refactored DoConfig a bit
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 09:27:54 +02:00
Gabriel Ravier
a9f95ed1a2
Changed some comments and messages in CMakeLists.txt
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2019-09-11 08:24:00 +02:00
Clownacy
00d0161832 Make DoConfig use the Config.dat in its directory
This is accurate to how the original DoConfig does it.
2019-09-10 13:48:17 +00:00
Clownacy
60bc16b161 Make CMake ignore if FLUID can't be found
Fixes #45
2019-09-10 12:23:50 +00:00
Clownacy
537d777536 Revert "Removed the DoConfig folder"
This reverts commit afb3e2f83e.

This branch needs this
2019-09-05 12:49:35 +00:00