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

rstl::optional is no more

This commit is contained in:
Jack Andersen 2019-06-11 16:14:39 -10:00
parent 0e8e3e906c
commit 8266f52cc2
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -53,31 +53,31 @@ endif()
if(MSVC) if(MSVC)
if(${URDE_VECTOR_ISA} STREQUAL "avx2") if(${URDE_VECTOR_ISA} STREQUAL "avx2")
add_compile_options(/arch:AVX2) add_compile_options(/arch:AVX2)
add_definitions(-D__SSE4_1__=1) add_compile_definitions(__SSE4_1__=1)
message(STATUS "Building with AVX2 Vector ISA") message(STATUS "Building with AVX2 Vector ISA")
elseif(${URDE_VECTOR_ISA} STREQUAL "avx") elseif(${URDE_VECTOR_ISA} STREQUAL "avx")
add_compile_options(/arch:AVX) add_compile_options(/arch:AVX)
add_definitions(-D__SSE4_1__=1) add_compile_definitions(__SSE4_1__=1)
message(STATUS "Building with AVX Vector ISA") message(STATUS "Building with AVX Vector ISA")
elseif(${URDE_VECTOR_ISA} STREQUAL "sse41") elseif(${URDE_VECTOR_ISA} STREQUAL "sse41")
add_definitions(-D__SSE4_1__=1) add_compile_definitions(__SSE4_1__=1)
message(STATUS "Building with SSE4.1 Vector ISA") message(STATUS "Building with SSE4.1 Vector ISA")
else() else()
message(STATUS "Building with SSE2 Vector ISA") message(STATUS "Building with SSE2 Vector ISA")
endif() endif()
if(${CMAKE_GENERATOR} MATCHES "Visual Studio*") if(${CMAKE_GENERATOR} MATCHES "Visual Studio*")
set(VS_DEFINES "/MP") set(VS_OPTIONS "/MP")
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT urde) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT urde)
endif() endif()
# Shaddup MSVC # Shaddup MSVC
add_definitions(-DUNICODE=1 -D_UNICODE=1 -D__SSE__=1 add_compile_definitions(UNICODE=1 _UNICODE=1 __SSE__=1
-D_CRT_SECURE_NO_WARNINGS=1 -DD_SCL_SECURE_NO_WARNINGS=1 _CRT_SECURE_NO_WARNINGS=1 D_SCL_SECURE_NO_WARNINGS=1
-D_SCL_SECURE_NO_DEPRECATE=1 -D_CRT_NONSTDC_NO_WARNINGS=1 _SCL_SECURE_NO_DEPRECATE=1 _CRT_NONSTDC_NO_WARNINGS=1
/IGNORE:4221 /wd4018 /wd4800 /wd4005 /wd4311 /wd4068 _ENABLE_EXTENDED_ALIGNED_STORAGE=1)
/wd4267 /wd4244 /wd4200 /wd4305 /wd4067 /wd4146 /wd4309 /wd4805 add_compile_options(/IGNORE:4221 /wd4018 /wd4800 /wd4005 /wd4311 /wd4068
-D_ENABLE_EXTENDED_ALIGNED_STORAGE=1 ${VS_DEFINES}) /wd4267 /wd4244 /wd4200 /wd4305 /wd4067 /wd4146 /wd4309 /wd4805 ${VS_OPTIONS})
if(WINDOWS_STORE) if(WINDOWS_STORE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /AI\"$ENV{PROGRAMFILES\(X86\)}/Microsoft Visual Studio/2017/Community/Common7/IDE/VC/vcpackages\" /AI\"$ENV{PROGRAMFILES\(X86\)}/Windows Kits/10/UnionMetadata\"") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /AI\"$ENV{PROGRAMFILES\(X86\)}/Microsoft Visual Studio/2017/Community/Common7/IDE/VC/vcpackages\" /AI\"$ENV{PROGRAMFILES\(X86\)}/Windows Kits/10/UnionMetadata\"")
@ -254,7 +254,7 @@ add_subdirectory(specter)
target_include_directories(specter PRIVATE ${CMAKE_SOURCE_DIR}) target_include_directories(specter PRIVATE ${CMAKE_SOURCE_DIR})
target_link_libraries(specter PRIVATE nod) target_link_libraries(specter PRIVATE nod)
add_subdirectory(assetnameparser) add_subdirectory(assetnameparser)
add_definitions(-DURDE_ZIP_INPUT_STREAM=1) # Enable CZipInputStream now that zlib header is known add_compile_definitions(URDE_ZIP_INPUT_STREAM=1) # Enable CZipInputStream now that zlib header is known
add_subdirectory(DataSpec) add_subdirectory(DataSpec)
add_subdirectory(kabufuda) add_subdirectory(kabufuda)
add_subdirectory(Editor) add_subdirectory(Editor)

4
Runtime/MP1/World/CFlaahgra.hpp
View File

@ -46,7 +46,7 @@ public:
void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const; void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const;
void Accept(IVisitor&); void Accept(IVisitor&);
rstl::optional<zeus::CAABox> GetTouchBounds() const { return {}; } std::optional<zeus::CAABox> GetTouchBounds() const { return {}; }
}; };
class CFlaahgra : public CPatterned { class CFlaahgra : public CPatterned {
@ -101,7 +101,7 @@ class CFlaahgra : public CPatterned {
zeus::CVector3f x894_; zeus::CVector3f x894_;
zeus::CVector3f x8a0_; zeus::CVector3f x8a0_;
CAnimRes x8ac_; CAnimRes x8ac_;
rstl::optional<TToken<CDependencyGroup>> x8c8_depGroup; std::optional<TToken<CDependencyGroup>> x8c8_depGroup;
bool x8d0_ = false; bool x8d0_ = false;
std::vector<CToken> x8d4_tokens; std::vector<CToken> x8d4_tokens;
union { union {