diff --git a/CMakeLists.txt b/CMakeLists.txt index 733fdf9..806d023 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,12 +20,30 @@ set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$:Debug>") -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") -set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG") +add_compile_definitions(UNICODE _UNICODE) +add_compile_definitions("$<$>:__int64=long long>") +add_compile_options("$<$>:-mssse3>") +if(MSVC) + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") +endif() +add_compile_definitions(UNICODE _UNICODE) +add_compile_definitions("$<$>:__int64=long long>") +add_compile_options("$<$>:-mssse3>") +if(MSVC) + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG") +endif() add_compile_options("$<$:/utf-8>") -add_compile_options(/MP) +add_compile_definitions(UNICODE _UNICODE) +add_compile_definitions("$<$>:__int64=long long>") +add_compile_options("$<$>:-mssse3>") +if(MSVC) + add_compile_options(/MP) +endif() +add_compile_definitions(UNICODE _UNICODE) +add_compile_definitions("$<$>:__int64=long long>") +add_compile_options("$<$>:-mssse3>") if(MSVC) add_compile_definitions(UNICODE _UNICODE) endif() diff --git a/extern/include/utf8.h b/extern/include/utf8.h index a7ce9d6..54ba25f 100644 --- a/extern/include/utf8.h +++ b/extern/include/utf8.h @@ -1,3 +1,4 @@ +#include #pragma once #include #include diff --git a/src/AudioLib/MaSoundInstance.h b/src/AudioLib/MaSoundInstance.h index 7c8e280..2c0f5cb 100644 --- a/src/AudioLib/MaSoundInstance.h +++ b/src/AudioLib/MaSoundInstance.h @@ -1,3 +1,4 @@ +#include #pragma once #define MA_NO_WASAPI #define MA_ENABLE_DSOUND diff --git a/src/AudioLib/Type.h b/src/AudioLib/Type.h index 967f38f..127d9ec 100644 --- a/src/AudioLib/Type.h +++ b/src/AudioLib/Type.h @@ -1,3 +1,4 @@ +#include #pragma once #include diff --git a/src/EffectLib/Type.h b/src/EffectLib/Type.h index 143e667..0adacc8 100644 --- a/src/EffectLib/Type.h +++ b/src/EffectLib/Type.h @@ -217,7 +217,7 @@ extern BOOL GetTokenTimeEventFloat(CTextFileLoader & rTextFileLoader, const char template void InsertItemTimeEvent(std::vector >* pTable, float fTime, T fValue) { - typedef std::vector >::iterator iterator; + typedef typename std::vector >::iterator iterator; iterator itor = std::lower_bound(pTable->begin(), pTable->end(), fTime); diff --git a/src/EterBase/Poly/StdAfx.h b/src/EterBase/Poly/StdAfx.h index 4ad2d49..d5df4df 100644 --- a/src/EterBase/Poly/StdAfx.h +++ b/src/EterBase/Poly/StdAfx.h @@ -1,2 +1,2 @@ #pragma once -#include "..\StdAfx.h" +#include "../StdAfx.h" diff --git a/src/EterBase/Stl.h b/src/EterBase/Stl.h index 48d844e..cf7dc6b 100644 --- a/src/EterBase/Stl.h +++ b/src/EterBase/Stl.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #pragma warning ( pop ) diff --git a/src/EterBase/Utils.h b/src/EterBase/Utils.h index 2ffeb3b..017f4d9 100644 --- a/src/EterBase/Utils.h +++ b/src/EterBase/Utils.h @@ -1,3 +1,4 @@ +#include #ifndef __INC_ETER2_ETERBASE_UTILS_H__ #define __INC_ETER2_ETERBASE_UTILS_H__ diff --git a/toolchains/linux-mingw64.cmake b/toolchains/linux-mingw64.cmake new file mode 100644 index 0000000..78cc944 --- /dev/null +++ b/toolchains/linux-mingw64.cmake @@ -0,0 +1,17 @@ +# Cross-compile for Windows x86_64 from Linux using MinGW + LLD. +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR x86_64) + +set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) +set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) +set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) + +set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32) +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + +set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld") +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld") +set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld")