mirror of https://github.com/AxioDL/metaforce.git
Windows PCH fixes
This commit is contained in:
parent
fd3792425d
commit
aec45ad2bb
|
@ -70,13 +70,8 @@ bool SpecBase::canExtract(const ExtractPassInfo& info, std::vector<ExtractReport
|
|||
|
||||
if (!memcmp(gameID, "R3O", 3))
|
||||
{
|
||||
unsigned int t = time(nullptr);
|
||||
#if _WIN32
|
||||
rand_s(&t);
|
||||
int r = t % MomErrCount;
|
||||
#else
|
||||
int r = rand_r(&t) % MomErrCount;
|
||||
#endif
|
||||
std::srand(std::time(0));
|
||||
int r = std::rand() % MomErrCount;
|
||||
Log.report(logvisor::Fatal, MomErr[r]);
|
||||
}
|
||||
|
||||
|
|
|
@ -69,8 +69,6 @@ elseif(UNIX)
|
|||
set(PLAT_SRCS mainicon_netwm.c)
|
||||
endif()
|
||||
|
||||
set_source_files_properties(main.cpp PROPERTIES COMPILE_DEFINITIONS URDE_DLPACKAGE="${URDE_DLPACKAGE}")
|
||||
|
||||
add_executable(urde WIN32 MACOSX_BUNDLE
|
||||
main.cpp ${PLAT_SRCS}
|
||||
Space.hpp Space.cpp atdna_Space.cpp
|
||||
|
@ -85,6 +83,8 @@ add_executable(urde WIN32 MACOSX_BUNDLE
|
|||
Camera.hpp Camera.cpp
|
||||
GameMode.hpp GameMode.cpp atdna_GameMode.cpp)
|
||||
|
||||
set_target_properties(urde PROPERTIES COMPILE_DEFINITIONS URDE_DLPACKAGE="${URDE_DLPACKAGE}")
|
||||
|
||||
target_link_libraries(urde
|
||||
UrdeLocales
|
||||
UrdeIcons
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
#include "ProjectResourceFactoryBase.hpp"
|
||||
#include "Runtime/IObj.hpp"
|
||||
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
namespace urde
|
||||
{
|
||||
static logvisor::Module Log("urde::ProjectResourceFactoryBase");
|
||||
|
|
|
@ -3,6 +3,9 @@
|
|||
|
||||
#include "IOStreams.hpp"
|
||||
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
namespace urde
|
||||
{
|
||||
|
||||
|
|
|
@ -10,6 +10,9 @@
|
|||
#include "IOStreams.hpp"
|
||||
#include "hecl/hecl.hpp"
|
||||
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
using namespace std::literals;
|
||||
|
||||
namespace urde
|
||||
|
|
2
hecl
2
hecl
|
@ -1 +1 @@
|
|||
Subproject commit 58a7267d424836bd22ed0fa0a086d4e3f8c93e60
|
||||
Subproject commit 23850bb06d6affaf57379f5a8bcfd5a624bf8d04
|
2
jbus
2
jbus
|
@ -1 +1 @@
|
|||
Subproject commit 3b94b2d40002ca6711abea20207dc72660423cff
|
||||
Subproject commit 2098e8da29af7bf441539a1f9326c6e9bf747d07
|
Loading…
Reference in New Issue