mirror of https://github.com/libAthena/athena.git
Windows fixes
This commit is contained in:
parent
3f24b7f33e
commit
30391f3352
|
@ -90,7 +90,6 @@ if(WIN32)
|
|||
endif()
|
||||
|
||||
# ATDNA target
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
include_directories(${LLVM_INCLUDE_DIRS})
|
||||
link_directories(${LLVM_LIBRARY_DIRS})
|
||||
add_executable(atdna main.cpp test.hpp ${PLAT_SRCS})
|
||||
|
@ -102,8 +101,7 @@ set_target_properties(atdna PROPERTIES
|
|||
COMPILE_FLAGS "/GR-")
|
||||
else()
|
||||
set_target_properties(atdna PROPERTIES
|
||||
COMPILE_FLAGS "-std=c++11 -fno-rtti -Wno-unused-parameter"
|
||||
LINK_FLAGS -std=c++11)
|
||||
COMPILE_FLAGS "-fno-rtti -Wno-unused-parameter")
|
||||
endif()
|
||||
|
||||
# Define installs
|
||||
|
|
|
@ -2431,4 +2431,3 @@ int main(int argc, const char** argv)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
#define __UTILITY_H__
|
||||
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <vector>
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
|
|
|
@ -5,6 +5,6 @@ libdir=${prefix}/lib
|
|||
Name: libAthena
|
||||
Description: Basic cross platform IO library
|
||||
Version: @ATHENA_VERSION@
|
||||
Cflags: -I${includedir}/Athena -std=c++11
|
||||
Cflags: -I${includedir}/Athena
|
||||
Libs: -L${libdir} -lathena-core -lathena-sakura -lathena-zelda -lathena-wiiSave
|
||||
Requires: zlib
|
||||
|
|
|
@ -70,7 +70,7 @@ bool Dir::touch()
|
|||
bool Dir::mkdir(std::string_view dir, mode_t mode)
|
||||
{
|
||||
#if _WIN32
|
||||
return !(::_mkdir(dir.c_str()) < 0);
|
||||
return !(::_mkdir(dir.data()) < 0);
|
||||
#else
|
||||
return !(::mkdir(dir.data(), mode) < 0);
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue