mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-08 15:44:56 +00:00
Windows PCH fixes
This commit is contained in:
@@ -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
Submodule hecl updated: 58a7267d42...23850bb06d
2
jbus
2
jbus
Submodule jbus updated: 3b94b2d400...2098e8da29
Reference in New Issue
Block a user