Skip to content

Fix New GUI Input Breakage#1735

Merged
LukeUsher merged 2 commits into
Cxbx-Reloaded:developfrom
RadWolfie:fix-new-input-breakage
Sep 28, 2019
Merged

Fix New GUI Input Breakage#1735
LukeUsher merged 2 commits into
Cxbx-Reloaded:developfrom
RadWolfie:fix-new-input-breakage

Conversation

@RadWolfie
Copy link
Copy Markdown
Member

The changes are to fix #1713 pull request to able allow loader's emulator project to compile. Since some includes were not meant for emulation usage. And moved emulation codes into proper common files.

Plus move SDL2 linkage directly into target_link_libraries, CMake, call since SDL2 is not Windows only platform. 😉

@RadWolfie
Copy link
Copy Markdown
Member Author

RadWolfie commented Sep 25, 2019

AppVeyor failed because of...
C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.23.28105\include\experimental/filesystem(26,1): fatal error C1189: #error: The <experimental/filesystem> header providing std::experimental::filesystem is deprecated by Microsoft and will be REMOVED. It is superseded by the C++17 <filesystem> header providing std::filesystem. You can define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING to acknowledge that you have received this warning.
Which is not relative to this pull request change. Since other two CIs are passing, even though I did verified on my end, decision to merge is still safe to use.

RESOLVED in different pull request #1736.

@RadWolfie RadWolfie force-pushed the fix-new-input-breakage branch from ab02e50 to 52da59e Compare September 27, 2019 16:10
@LukeUsher LukeUsher merged commit b1d3cfb into Cxbx-Reloaded:develop Sep 28, 2019
@RadWolfie RadWolfie deleted the fix-new-input-breakage branch September 28, 2019 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants