EventHorizonStudio/EHS
EventHorizonStudio/EHS
3
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects 1 Releases 7 Wiki Activity

dynamic #10

Merged
Karutoh merged 2 commits from dynamic into main 2024-07-24 01:39:29 -07:00
Conversation 0 Commits 2 Files Changed 122 +14 -5
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b70383448 - Show all commits

6
include/ehs/Str.h
View File

@ -1892,9 +1892,9 @@ namespace ehs
} }
}; };
typedef Str<Char_32, UInt_64> Str_32; EHS_LIB_IO typedef Str<Char_32, UInt_64> Str_32;
typedef Str<Char_16, UInt_64> Str_16; EHS_LIB_IO typedef Str<Char_16, UInt_64> Str_16;
typedef Str<Char_8, UInt_64> Str_8; EHS_LIB_IO typedef Str<Char_8, UInt_64> Str_8;
} }
template<typename T = ehs::Char_8, typename N = ehs::UInt_64> template<typename T = ehs::Char_8, typename N = ehs::UInt_64>

13
include/ehs/system/OS.h
View File

@ -1,11 +1,19 @@
#pragma once #pragma once
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#define EHS_OS_WINDOWS #define EHS_OS_WINDOWS
#define EHS_FILE __FILE__ #define EHS_FILE __FILE__
#define EHS_FUNC __FUNCTION__ #define EHS_FUNC __FUNCTION__
#define EHS_LINE __LINE__ #define EHS_LINE __LINE__
#if defined(EHS_EXPORT)
#define EHS_LIB_IO __declspec(dllexport)
#elif defined(EHS_IMPORT)
#define EHS_LIB_IO __declspec(dllimport)
#else
#define EHS_LIB_IO
#endif
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif #endif
@ -22,6 +30,7 @@
#define EHS_FILE __FILE__ #define EHS_FILE __FILE__
#define EHS_FUNC __FUNCTION__ #define EHS_FUNC __FUNCTION__
#define EHS_LINE __LINE__ #define EHS_LINE __LINE__
#define EHS_LIB_IO
typedef int Handle; typedef int Handle;
#endif #endif