-
Notifications
You must be signed in to change notification settings - Fork 125
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ares: move generated sources out of ares.hpp (#1704)
Random fix from CMake work. Precompiled headers under CMake are currently buggy and unreliable on Windows, largely because the precompiled `<ares/ares.hpp>` header includes `<ares/resource/resource.hpp>`, which is generated by `sourcery` as part of the build process. While sourcery will almost never meaningfully change the contents of this `resource.hpp` file, Windows may insert its own line endings depending on the user's environment, and despite enforcing uniform line endings as part of our `.gitattributes` file, some compilers will throw a fit about the precompiled header being modified from underneath it. Since the `resource.hpp` file is simple, short, and not included in that many places, we can just refactor it out of `<ares/ares.hpp>` without issue, and precompiled headers will work again regardless of system line ending convention or environment. Tested to build locally on macOS; CI run definitely recommended.
- Loading branch information
Showing
7 changed files
with
6 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
#include <fc/fc.hpp> | ||
#include <ares/resource/resource.hpp> | ||
|
||
namespace ares::Famicom { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
#include <ms/ms.hpp> | ||
#include <ares/resource/resource.hpp> | ||
|
||
namespace ares::MasterSystem { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
#include <sfc/sfc.hpp> | ||
#include <ares/resource/resource.hpp> | ||
|
||
namespace ares::SuperFamicom { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
#include <ws/ws.hpp> | ||
#include <ares/resource/resource.hpp> | ||
|
||
namespace ares::WonderSwan { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters