Clownacy
a093ebd018
Add another missing CMake macro
2020-04-03 01:05:24 +01:00
Clownacy
ddc2d795f5
Add a missing CMake macro
...
Was causing macOS Travis builds to fail
2020-04-03 00:00:22 +01:00
Clownacy
10f9882108
Shut up a warning
2020-04-03 00:00:13 +01:00
Gabriel Ravier
afd3abecc4
Correctly used Attributes.h instead of a definition directly in SoftwareMixer.cpp
...
Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
2020-04-03 00:43:34 +02:00
Gabriel Ravier
f68984bd58
Merge branch 'portable' into improvePerformance2
...
# Conflicts:
# src/Backends/Audio/SDL2.cpp
2020-04-03 00:36:44 +02:00
Clownacy
c194ff9dc6
Revert "Use cmake -B
in Travis"
...
This reverts commit 4ec5951bed
.
2020-04-02 23:21: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
ef00bbcdd4
Get window icon working in GLFW
...
Amazingly, this actually works in SDL2, so now they both use this
method.
2020-04-02 22:03:08 +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
373c0e658a
Use PlatformBackend_ShowMessageBox somewhere
2020-04-02 21:32:50 +01:00
Clownacy
a935c7bf49
Make Travis test alternate backends
2020-04-02 21:03:38 +01:00
Clownacy
4ec5951bed
Use cmake -B
in Travis
2020-04-02 21:01:54 +01:00
Clownacy
a16086291e
Fix Travis not selecting a rendering backend
2020-04-02 21:01:11 +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
8896b1225b
Update Travis
2020-04-02 20:27:23 +01:00
Clownacy
5244967fab
Update documentation
2020-04-02 20:22:52 +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
d7ca8b3874
Remove the Makefile
...
Made redundant by CMake, and it's an absolute pain to maintain.
2020-04-02 14:23:10 +01:00
Clownacy
199e21623e
Merge branch 'accurate' into portable
2020-04-02 14:19:51 +01:00
Clownacy
da3d131291
Move CMake .gitignore line
...
No longer specific to the portable/enhanced branches
2020-04-02 14:18:48 +01:00
Clownacy
d40991e682
Remove VS2017 build files
...
Made redundant by CMake
2020-04-02 14:18:18 +01:00
Clownacy
9a0d2c4c94
Fix GLFW3 pkg-config detection
2020-04-02 00:37:30 +01:00
Clownacy
1839370ae9
More warnings
2020-04-02 00:29:57 +01:00
Clownacy
6b34ea64c5
Shut up some CMake warnings
2020-04-02 00:28:44 +01:00
Clownacy
cf0ee89e93
Avoid WinMain on Windows
...
This is a better for GLFW on Windows, and it might have fixed the
long-standing bug where FORCE_LOCAL_LIBS on MSYS2 wouldn't work
because SDL2 would mysteriously fail because of something involving
WinMain.
2020-04-02 00:16:43 +01:00
Clownacy
96f46f3387
Fix compilation error
2020-04-02 00:00:12 +01:00
Clownacy
30c7967ed4
Fixes
2020-04-01 23:15:22 +01:00
Clownacy
85e1afb35a
Added GLFW3 sources
...
This allows it to be compiled locally.
2020-04-01 22:51:10 +01:00
Clownacy
1e0f0ed99c
Add pkg-config GLFW3 support
2020-04-01 22:42:27 +01:00
Clownacy
135365f941
Merge branch 'portable' of https://github.com/Clownacy/Cave-Story-Engine-2 into portable
2020-04-01 22:21:56 +01:00
Clownacy
00ee155176
Fixes and a comment
2020-04-01 21:58:02 +01:00
Clownacy
db2f079266
Cleanup and comments
2020-04-01 21:52:18 +01:00
Clownacy
0182ab6eb3
Get drag-and-drop working again
2020-04-01 21:43:04 +01:00
Clownacy
b3591ba3da
Remove dead code
2020-04-01 21:37:45 +01:00
Clownacy
add0627f03
Restore custom cursor support
2020-04-01 21:36:46 +01:00
Clownacy
f23117bbdc
Overhaul how window icon loading works
...
Now most of it has been moved out of the backends.
2020-04-01 21:20:26 +01:00
Clownacy
878cac3b3f
Implement mouse-hiding in fullscreen
2020-04-01 21:05:05 +01:00
Clownacy
0c70b1ac31
Remove seemingly-useless casts
2020-04-01 20:50:45 +01:00
Clownacy
f4a810be51
Alter pkg-config notice, now that CMake uses it
2020-04-01 20:38:30 +01:00
Clownacy
e324d40c5b
Merge branch 'accurate' into portable
2020-04-01 20:36:04 +01:00