Older changes
This commit is contained in:
parent
01a77d722d
commit
b092d5a265
7 changed files with 22 additions and 4 deletions
1
.clangd
1
.clangd
|
|
@ -1,3 +1,2 @@
|
||||||
CompileFlags:
|
CompileFlags:
|
||||||
CompilationDatabase: bin
|
CompilationDatabase: bin
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,21 @@ target_include_directories(${OMNIA_STD_LIB} PUBLIC ${INCLUDE_DIRS})
|
||||||
target_include_directories(${OMNIA_GFX_LIB} PUBLIC ${INCLUDE_DIRS})
|
target_include_directories(${OMNIA_GFX_LIB} PUBLIC ${INCLUDE_DIRS})
|
||||||
target_include_directories(${TEST_TARGET} PUBLIC ${INCLUDE_DIRS})
|
target_include_directories(${TEST_TARGET} PUBLIC ${INCLUDE_DIRS})
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
set(MSYS2_UCRT64 "C:/msys64/ucrt64")
|
||||||
|
target_include_directories(${OMNIA_STD_LIB} PRIVATE
|
||||||
|
"${MSYS2_UCRT64}/include"
|
||||||
|
"${MSYS2_UCRT64}/include/c++/13.2.0"
|
||||||
|
"${MSYS2_UCRT64}/include/c++/13.2.0/x86_64-w64-mingw32"
|
||||||
|
)
|
||||||
|
set(MSYS2_UCRT64 "C:/msys64/ucrt64")
|
||||||
|
target_include_directories(${OMNIA_GFX_LIB} PRIVATE
|
||||||
|
"${MSYS2_UCRT64}/include"
|
||||||
|
"${MSYS2_UCRT64}/include/c++/13.2.0"
|
||||||
|
"${MSYS2_UCRT64}/include/c++/13.2.0/x86_64-w64-mingw32"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
add_compile_options(-O3 -MMD -MP -Wall -ggdb -fsanitize=address)
|
add_compile_options(-O3 -MMD -MP -Wall -ggdb -fsanitize=address)
|
||||||
target_compile_definitions(${OMNIA_STD_LIB} PUBLIC OX_DEBUG_BUILD)
|
target_compile_definitions(${OMNIA_STD_LIB} PUBLIC OX_DEBUG_BUILD)
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
2031
|
2035
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@
|
||||||
#include <ostd/math/Geometry.hpp>
|
#include <ostd/math/Geometry.hpp>
|
||||||
#include <ostd/io/IOHandlers.hpp>
|
#include <ostd/io/IOHandlers.hpp>
|
||||||
#include <ostd/string/String.hpp>
|
#include <ostd/string/String.hpp>
|
||||||
|
#include <ostd/utils/Defines.hpp>
|
||||||
|
|
||||||
#ifndef WINDOWS_OS
|
#ifndef WINDOWS_OS
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#include "FileSystem.hpp"
|
#include "FileSystem.hpp"
|
||||||
#include "Logger.hpp"
|
#include "Logger.hpp"
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
#include <ostd/utils/Defines.hpp>
|
||||||
|
|
||||||
namespace ostd
|
namespace ostd
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
#include "Console.hpp"
|
#include "Console.hpp"
|
||||||
#include <unistd.h>
|
#ifndef WINDOWS_OS
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace ostd
|
namespace ostd
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ namespace ostd
|
||||||
inline String(void) { m_data = ""; }
|
inline String(void) { m_data = ""; }
|
||||||
inline String(const cpp_string& str) { m_data = str; }
|
inline String(const cpp_string& str) { m_data = str; }
|
||||||
inline String(const char* str) { m_data = str; }
|
inline String(const char* str) { m_data = str; }
|
||||||
inline String(const std::filesystem::path& path) { m_data = path; }
|
inline String(const std::filesystem::path& path) { m_data = path.string(); }
|
||||||
|
|
||||||
inline cpp_string cpp_str(void) const { return m_data; }
|
inline cpp_string cpp_str(void) const { return m_data; }
|
||||||
inline cpp_string& cpp_str_ref(void) { return m_data; }
|
inline cpp_string& cpp_str_ref(void) { return m_data; }
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue