diff --git a/build/.gitignore b/build/.gitignore index 1ca9192..25f3451 100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -1,2 +1,3 @@ builds/ +_deps/ .vs/ \ No newline at end of file diff --git a/build/test/CMakeLists.txt b/build/test/CMakeLists.txt index 6c30346..51afdc3 100644 --- a/build/test/CMakeLists.txt +++ b/build/test/CMakeLists.txt @@ -3,6 +3,3 @@ s_project(oodle::test EXEC IS_SIMPLE) s_link_libraries(PRIVATE oodle::data::static) s_set_properties(PROPERTIES OUTPUT_NAME "ozip") - -# clang-cl complains -s_compile_options(PRIVATE /EHsc) \ No newline at end of file diff --git a/build/test/main.cpp b/build/test/main.cpp index 008d3cc..24a4008 100644 --- a/build/test/main.cpp +++ b/build/test/main.cpp @@ -80,20 +80,6 @@ char logfilename[] = "c:\\test\\OZIP.log"; #define o_fileno fileno #endif -#ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#if defined(_MSC_VER) && _MSC_VER >= 1600 // in 2010 aka 10.0 and later -#define RR_UNUSED_VARIABLE(x) (void) (x) -#else -#define RR_UNUSED_VARIABLE(x) (void)(sizeof(x)) -#endif - #define NO_OODLEX #ifdef NO_OODLEX @@ -179,6 +165,20 @@ static void OodleX_Shutdown(const char* threadProfileLogName OODEFAULT(NULL), } #endif +#ifndef max +#define max(a,b) (((a) > (b)) ? (a) : (b)) +#endif + +#ifndef min +#define min(a,b) (((a) < (b)) ? (a) : (b)) +#endif + +#if defined(_MSC_VER) && _MSC_VER >= 1600 // in 2010 aka 10.0 and later +#define RR_UNUSED_VARIABLE(x) (void) (x) +#else +#define RR_UNUSED_VARIABLE(x) (void)(sizeof(x)) +#endif + #ifndef MAX_PATH #define MAX_PATH 260 #endif