libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows build fixes

This commit is contained in:
Jack Andersen 2015-08-03 17:42:44 -10:00
parent 3d220841c0
commit f06afb429c
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -148,6 +148,9 @@ add_library(AthenaZelda
include/Athena/SkywardSwordQuest.hpp include/Athena/SkywardSwordQuest.hpp
) )
# Icon
set(ATHENA_ICO ${CMAKE_CURRENT_SOURCE_DIR}/Athena.ico)
# Offer the user the choice of overriding the installation directories # Offer the user the choice of overriding the installation directories
set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries") set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")
set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")

3
atdna/CMakeLists.txt
View File

@ -49,9 +49,6 @@ foreach(p BIN INCLUDE CMAKE)
endif() endif()
endforeach() endforeach()
# Icon
set(ATHENA_ICO ${CMAKE_CURRENT_SOURCE_DIR}/Athena.ico)
# Windows resource # Windows resource
if(WIN32) if(WIN32)
configure_file(main.rc.in main.rc @ONLY) configure_file(main.rc.in main.rc @ONLY)

8
include/Athena/DNAYaml.hpp
View File

@ -177,7 +177,11 @@ inline std::unique_ptr<YAMLNode> ValToNode(const atUint32& val)
template <> template <>
inline atInt64 NodeToVal(const YAMLNode* node) inline atInt64 NodeToVal(const YAMLNode* node)
{ {
#if _WIN32
return _strtoi64(node->m_scalarString.c_str(), NULL, 0);
#else
return strtoq(node->m_scalarString.c_str(), NULL, 0); return strtoq(node->m_scalarString.c_str(), NULL, 0);
#endif
} }
template <> template <>
@ -193,7 +197,11 @@ inline std::unique_ptr<YAMLNode> ValToNode(const atInt64& val)
template <> template <>
inline atUint64 NodeToVal(const YAMLNode* node) inline atUint64 NodeToVal(const YAMLNode* node)
{ {
#if _WIN32
return _strtoui64(node->m_scalarString.c_str(), NULL, 0);
#else
return strtouq(node->m_scalarString.c_str(), NULL, 0); return strtouq(node->m_scalarString.c_str(), NULL, 0);
#endif
} }
template <> template <>