AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-13 14:05:52 +00:00
Code Issues Projects Releases Wiki Activity

Windows PCH fixes

Browse Source
This commit is contained in:
Jack Andersen 2017-12-29 15:09:45 -10:00
parent fd3792425d
commit aec45ad2bb
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DataSpec/SpecBase.cpp
View File

@ -70,13 +70,8 @@ bool SpecBase::canExtract(const ExtractPassInfo& info, std::vector<ExtractReport
if (!memcmp(gameID, "R3O", 3)) if (!memcmp(gameID, "R3O", 3))
{ {
unsigned int t = time(nullptr); std::srand(std::time(0));
#if _WIN32 int r = std::rand() % MomErrCount;
rand_s(&t);
int r = t % MomErrCount;
#else
int r = rand_r(&t) % MomErrCount;
#endif
Log.report(logvisor::Fatal, MomErr[r]); Log.report(logvisor::Fatal, MomErr[r]);
} }

4
Editor/CMakeLists.txt
View File

@ -69,8 +69,6 @@ elseif(UNIX)
set(PLAT_SRCS mainicon_netwm.c) set(PLAT_SRCS mainicon_netwm.c)
endif() endif()
set_source_files_properties(main.cpp PROPERTIES COMPILE_DEFINITIONS URDE_DLPACKAGE="${URDE_DLPACKAGE}")
add_executable(urde WIN32 MACOSX_BUNDLE add_executable(urde WIN32 MACOSX_BUNDLE
main.cpp ${PLAT_SRCS} main.cpp ${PLAT_SRCS}
Space.hpp Space.cpp atdna_Space.cpp Space.hpp Space.cpp atdna_Space.cpp
@ -85,6 +83,8 @@ add_executable(urde WIN32 MACOSX_BUNDLE
Camera.hpp Camera.cpp Camera.hpp Camera.cpp
GameMode.hpp GameMode.cpp atdna_GameMode.cpp) GameMode.hpp GameMode.cpp atdna_GameMode.cpp)
set_target_properties(urde PROPERTIES COMPILE_DEFINITIONS URDE_DLPACKAGE="${URDE_DLPACKAGE}")
target_link_libraries(urde target_link_libraries(urde
UrdeLocales UrdeLocales
UrdeIcons UrdeIcons

3
Editor/ProjectResourceFactoryBase.cpp
View File

@ -1,6 +1,9 @@
#include "ProjectResourceFactoryBase.hpp" #include "ProjectResourceFactoryBase.hpp"
#include "Runtime/IObj.hpp" #include "Runtime/IObj.hpp"
#undef min
#undef max
namespace urde namespace urde
{ {
static logvisor::Module Log("urde::ProjectResourceFactoryBase"); static logvisor::Module Log("urde::ProjectResourceFactoryBase");

3
Runtime/Character/CCharAnimTime.hpp
View File

@ -3,6 +3,9 @@
#include "IOStreams.hpp" #include "IOStreams.hpp"
#undef min
#undef max
namespace urde namespace urde
{ {

3
Runtime/RetroTypes.hpp
View File

@ -10,6 +10,9 @@
#include "IOStreams.hpp" #include "IOStreams.hpp"
#include "hecl/hecl.hpp" #include "hecl/hecl.hpp"
#undef min
#undef max
using namespace std::literals; using namespace std::literals;
namespace urde namespace urde

2
hecl

@ -1 +1 @@
Subproject commit 58a7267d424836bd22ed0fa0a086d4e3f8c93e60 Subproject commit 23850bb06d6affaf57379f5a8bcfd5a624bf8d04

2
jbus

@ -1 +1 @@
Subproject commit 3b94b2d40002ca6711abea20207dc72660423cff Subproject commit 2098e8da29af7bf441539a1f9326c6e9bf747d07