Windows build
This commit is contained in:
parent
07b597d6f2
commit
198ed337e3
|
@ -17,10 +17,6 @@ include_directories(${CMAKE_SOURCE_DIR}/deps/libtcod)
|
||||||
include_directories(${CMAKE_SOURCE_DIR}/deps/cpython)
|
include_directories(${CMAKE_SOURCE_DIR}/deps/cpython)
|
||||||
include_directories(${CMAKE_SOURCE_DIR}/deps/Python)
|
include_directories(${CMAKE_SOURCE_DIR}/deps/Python)
|
||||||
|
|
||||||
# TODO: Move this into the WIN32 if block below (as 'else')
|
|
||||||
#include_directories(${CMAKE_SOURCE_DIR}/platform/linux)
|
|
||||||
include_directories(${CMAKE_SOURCE_DIR}/deps/platform/linux)
|
|
||||||
|
|
||||||
# Collect all the source files
|
# Collect all the source files
|
||||||
file(GLOB_RECURSE SOURCES "src/*.cpp")
|
file(GLOB_RECURSE SOURCES "src/*.cpp")
|
||||||
|
|
||||||
|
@ -43,6 +39,9 @@ if(WIN32)
|
||||||
# include_directories(path_to_additional_includes)
|
# include_directories(path_to_additional_includes)
|
||||||
# link_directories(path_to_additional_libs)
|
# link_directories(path_to_additional_libs)
|
||||||
# list(APPEND LINK_LIBS additional_windows_libs)
|
# list(APPEND LINK_LIBS additional_windows_libs)
|
||||||
|
include_directories(${CMAKE_SOURCE_DIR}/deps/platform/windows)
|
||||||
|
else()
|
||||||
|
include_directories(${CMAKE_SOURCE_DIR}/deps/platform/linux)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Add the directory where the linker should look for the libraries
|
# Add the directory where the linker should look for the libraries
|
||||||
|
|
|
@ -0,0 +1,40 @@
|
||||||
|
#ifndef __PLATFORM
|
||||||
|
#define __PLATFORM
|
||||||
|
#define __PLATFORM_SET_PYTHON_SEARCH_PATHS 1
|
||||||
|
std::wstring executable_path()
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
wchar_t buffer[MAX_PATH];
|
||||||
|
GetModuleFileName(NULL, buffer, MAX_PATH);
|
||||||
|
std::wstring exec_path = buffer;
|
||||||
|
*/
|
||||||
|
auto exec_path = std::filesystem::canonical("/proc/self/exe").parent_path();
|
||||||
|
return exec_path.wstring();
|
||||||
|
//size_t path_index = exec_path.find_last_of('/');
|
||||||
|
//return exec_path.substr(0, path_index);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
std::wstring executable_filename()
|
||||||
|
{
|
||||||
|
auto exec_path = std::filesystem::canonical("/proc/self/exe");
|
||||||
|
return exec_path.wstring();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::wstring working_path()
|
||||||
|
{
|
||||||
|
auto cwd = std::filesystem::current_path();
|
||||||
|
return cwd.wstring();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string narrow_string(std::wstring convertme)
|
||||||
|
{
|
||||||
|
//setup converter
|
||||||
|
using convert_type = std::codecvt_utf8<wchar_t>;
|
||||||
|
std::wstring_convert<convert_type, wchar_t> converter;
|
||||||
|
|
||||||
|
//use converter (.to_bytes: wstr->str, .from_bytes: str->wstr)
|
||||||
|
return converter.to_bytes(convertme);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
|
@ -0,0 +1,39 @@
|
||||||
|
#ifndef __PLATFORM
|
||||||
|
#define __PLATFORM
|
||||||
|
#define __PLATFORM_SET_PYTHON_SEARCH_PATHS 0
|
||||||
|
#include <Windows.h>
|
||||||
|
|
||||||
|
std::wstring executable_path()
|
||||||
|
{
|
||||||
|
wchar_t buffer[MAX_PATH];
|
||||||
|
GetModuleFileName(NULL, buffer, MAX_PATH);
|
||||||
|
std::wstring exec_path = buffer;
|
||||||
|
size_t path_index = exec_path.find_last_of(L"\\/");
|
||||||
|
return exec_path.substr(0, path_index);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::wstring executable_filename()
|
||||||
|
{
|
||||||
|
wchar_t buffer[MAX_PATH];
|
||||||
|
GetModuleFileName(NULL, buffer, MAX_PATH);
|
||||||
|
std::wstring exec_path = buffer;
|
||||||
|
return exec_path;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::wstring working_path()
|
||||||
|
{
|
||||||
|
auto cwd = std::filesystem::current_path();
|
||||||
|
return cwd.wstring();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string narrow_string(std::wstring convertme)
|
||||||
|
{
|
||||||
|
//setup converter
|
||||||
|
using convert_type = std::codecvt_utf8<wchar_t>;
|
||||||
|
std::wstring_convert<convert_type, wchar_t> converter;
|
||||||
|
|
||||||
|
//use converter (.to_bytes: wstr->str, .from_bytes: str->wstr)
|
||||||
|
return converter.to_bytes(convertme);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue