AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'pr-153'

This commit is contained in:
Luke Street 2020-02-21 13:46:52 -05:00
parent f1dd82066a e835528fe8
commit 16586c200b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -75,7 +75,7 @@ if(MSVC)
add_compile_definitions(UNICODE=1 _UNICODE=1 __SSE__=1 add_compile_definitions(UNICODE=1 _UNICODE=1 __SSE__=1
_CRT_SECURE_NO_WARNINGS=1 D_SCL_SECURE_NO_WARNINGS=1 _CRT_SECURE_NO_WARNINGS=1 D_SCL_SECURE_NO_WARNINGS=1
_SCL_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1 _SCL_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1
_ENABLE_EXTENDED_ALIGNED_STORAGE=1) _ENABLE_EXTENDED_ALIGNED_STORAGE=1 NOMINMAX=1)
add_compile_options(/IGNORE:4221 /wd4018 /wd4800 /wd4005 /wd4311 /wd4068 add_compile_options(/IGNORE:4221 /wd4018 /wd4800 /wd4005 /wd4311 /wd4068
/wd4267 /wd4244 /wd4200 /wd4305 /wd4067 /wd4146 /wd4309 /wd4805 ${VS_OPTIONS}) /wd4267 /wd4244 /wd4200 /wd4305 /wd4067 /wd4146 /wd4309 /wd4805 ${VS_OPTIONS})

2
Runtime/GameGlobalObjects.hpp
View File

@ -34,6 +34,8 @@
#include "../DataSpec/DNACommon/Tweaks/ITweakGuiColors.hpp" #include "../DataSpec/DNACommon/Tweaks/ITweakGuiColors.hpp"
#endif #endif
#include "Runtime/CTextureCache.hpp"
namespace urde { namespace urde {
extern class IMain* g_Main; extern class IMain* g_Main;
namespace MP1 { namespace MP1 {