diff --git a/7DRL b/7DRL index 5c853de..8bac443 100755 Binary files a/7DRL and b/7DRL differ diff --git a/CMakeCache.txt b/CMakeCache.txt index 1861071..aa25fbd 100644 --- a/CMakeCache.txt +++ b/CMakeCache.txt @@ -258,9 +258,9 @@ CMAKE_CACHEFILE_DIR:INTERNAL=/home/tatjam/code/u101 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 //Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=16 +CMAKE_CACHE_MINOR_VERSION:INTERNAL=17 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=5 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=0 //ADVANCED property for variable: CMAKE_COLOR_MAKEFILE CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1 //Path to CMake executable. @@ -371,7 +371,7 @@ CMAKE_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_READELF CMAKE_READELF-ADVANCED:INTERNAL=1 //Path to CMake installation. -CMAKE_ROOT:INTERNAL=/usr/share/cmake-3.16 +CMAKE_ROOT:INTERNAL=/usr/share/cmake-3.17 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG diff --git a/CMakeFiles/3.17.0/CMakeCCompiler.cmake b/CMakeFiles/3.17.0/CMakeCCompiler.cmake new file mode 100644 index 0000000..c00446d --- /dev/null +++ b/CMakeFiles/3.17.0/CMakeCCompiler.cmake @@ -0,0 +1,76 @@ +set(CMAKE_C_COMPILER "/usr/bin/cc") +set(CMAKE_C_COMPILER_ARG1 "") +set(CMAKE_C_COMPILER_ID "GNU") +set(CMAKE_C_COMPILER_VERSION "9.3.0") +set(CMAKE_C_COMPILER_VERSION_INTERNAL "") +set(CMAKE_C_COMPILER_WRAPPER "") +set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11") +set(CMAKE_C_COMPILE_FEATURES "c_std_90;c_function_prototypes;c_std_99;c_restrict;c_variadic_macros;c_std_11;c_static_assert") +set(CMAKE_C90_COMPILE_FEATURES "c_std_90;c_function_prototypes") +set(CMAKE_C99_COMPILE_FEATURES "c_std_99;c_restrict;c_variadic_macros") +set(CMAKE_C11_COMPILE_FEATURES "c_std_11;c_static_assert") + +set(CMAKE_C_PLATFORM_ID "Linux") +set(CMAKE_C_SIMULATE_ID "") +set(CMAKE_C_COMPILER_FRONTEND_VARIANT "") +set(CMAKE_C_SIMULATE_VERSION "") + + + +set(CMAKE_AR "/usr/bin/ar") +set(CMAKE_C_COMPILER_AR "/usr/bin/gcc-ar") +set(CMAKE_RANLIB "/usr/bin/ranlib") +set(CMAKE_C_COMPILER_RANLIB "/usr/bin/gcc-ranlib") +set(CMAKE_LINKER "/usr/bin/ld") +set(CMAKE_MT "") +set(CMAKE_COMPILER_IS_GNUCC 1) +set(CMAKE_C_COMPILER_LOADED 1) +set(CMAKE_C_COMPILER_WORKS TRUE) +set(CMAKE_C_ABI_COMPILED TRUE) +set(CMAKE_COMPILER_IS_MINGW ) +set(CMAKE_COMPILER_IS_CYGWIN ) +if(CMAKE_COMPILER_IS_CYGWIN) + set(CYGWIN 1) + set(UNIX 1) +endif() + +set(CMAKE_C_COMPILER_ENV_VAR "CC") + +if(CMAKE_COMPILER_IS_MINGW) + set(MINGW 1) +endif() +set(CMAKE_C_COMPILER_ID_RUN 1) +set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) +set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) +set(CMAKE_C_LINKER_PREFERENCE 10) + +# Save compiler ABI information. +set(CMAKE_C_SIZEOF_DATA_PTR "8") +set(CMAKE_C_COMPILER_ABI "ELF") +set(CMAKE_C_LIBRARY_ARCHITECTURE "") + +if(CMAKE_C_SIZEOF_DATA_PTR) + set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}") +endif() + +if(CMAKE_C_COMPILER_ABI) + set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}") +endif() + +if(CMAKE_C_LIBRARY_ARCHITECTURE) + set(CMAKE_LIBRARY_ARCHITECTURE "") +endif() + +set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "") +if(CMAKE_C_CL_SHOWINCLUDES_PREFIX) + set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}") +endif() + + + + + +set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include;/usr/local/include;/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include-fixed;/usr/include") +set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "gcc;gcc_s;c;gcc;gcc_s") +set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0;/usr/lib;/lib") +set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/CMakeFiles/3.17.0/CMakeCXXCompiler.cmake b/CMakeFiles/3.17.0/CMakeCXXCompiler.cmake new file mode 100644 index 0000000..ce72e5f --- /dev/null +++ b/CMakeFiles/3.17.0/CMakeCXXCompiler.cmake @@ -0,0 +1,88 @@ +set(CMAKE_CXX_COMPILER "/usr/bin/c++") +set(CMAKE_CXX_COMPILER_ARG1 "") +set(CMAKE_CXX_COMPILER_ID "GNU") +set(CMAKE_CXX_COMPILER_VERSION "9.3.0") +set(CMAKE_CXX_COMPILER_VERSION_INTERNAL "") +set(CMAKE_CXX_COMPILER_WRAPPER "") +set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "14") +set(CMAKE_CXX_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters;cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates;cxx_std_17;cxx_std_20") +set(CMAKE_CXX98_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters") +set(CMAKE_CXX11_COMPILE_FEATURES "cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") +set(CMAKE_CXX14_COMPILE_FEATURES "cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") +set(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17") +set(CMAKE_CXX20_COMPILE_FEATURES "cxx_std_20") + +set(CMAKE_CXX_PLATFORM_ID "Linux") +set(CMAKE_CXX_SIMULATE_ID "") +set(CMAKE_CXX_COMPILER_FRONTEND_VARIANT "") +set(CMAKE_CXX_SIMULATE_VERSION "") + + + +set(CMAKE_AR "/usr/bin/ar") +set(CMAKE_CXX_COMPILER_AR "/usr/bin/gcc-ar") +set(CMAKE_RANLIB "/usr/bin/ranlib") +set(CMAKE_CXX_COMPILER_RANLIB "/usr/bin/gcc-ranlib") +set(CMAKE_LINKER "/usr/bin/ld") +set(CMAKE_MT "") +set(CMAKE_COMPILER_IS_GNUCXX 1) +set(CMAKE_CXX_COMPILER_LOADED 1) +set(CMAKE_CXX_COMPILER_WORKS TRUE) +set(CMAKE_CXX_ABI_COMPILED TRUE) +set(CMAKE_COMPILER_IS_MINGW ) +set(CMAKE_COMPILER_IS_CYGWIN ) +if(CMAKE_COMPILER_IS_CYGWIN) + set(CYGWIN 1) + set(UNIX 1) +endif() + +set(CMAKE_CXX_COMPILER_ENV_VAR "CXX") + +if(CMAKE_COMPILER_IS_MINGW) + set(MINGW 1) +endif() +set(CMAKE_CXX_COMPILER_ID_RUN 1) +set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;CPP) +set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) + +foreach (lang C OBJC OBJCXX) + if (CMAKE_${lang}_COMPILER_ID_RUN) + foreach(extension IN LISTS CMAKE_${lang}_SOURCE_FILE_EXTENSIONS) + list(REMOVE_ITEM CMAKE_CXX_SOURCE_FILE_EXTENSIONS ${extension}) + endforeach() + endif() +endforeach() + +set(CMAKE_CXX_LINKER_PREFERENCE 30) +set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) + +# Save compiler ABI information. +set(CMAKE_CXX_SIZEOF_DATA_PTR "8") +set(CMAKE_CXX_COMPILER_ABI "ELF") +set(CMAKE_CXX_LIBRARY_ARCHITECTURE "") + +if(CMAKE_CXX_SIZEOF_DATA_PTR) + set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}") +endif() + +if(CMAKE_CXX_COMPILER_ABI) + set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}") +endif() + +if(CMAKE_CXX_LIBRARY_ARCHITECTURE) + set(CMAKE_LIBRARY_ARCHITECTURE "") +endif() + +set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "") +if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX) + set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}") +endif() + + + + + +set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "/usr/include/c++/9.3.0;/usr/include/c++/9.3.0/x86_64-pc-linux-gnu;/usr/include/c++/9.3.0/backward;/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include;/usr/local/include;/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include-fixed;/usr/include") +set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;gcc_s;gcc;c;gcc_s;gcc") +set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/x86_64-pc-linux-gnu/9.3.0;/usr/lib;/lib") +set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/CMakeFiles/3.17.0/CMakeDetermineCompilerABI_C.bin b/CMakeFiles/3.17.0/CMakeDetermineCompilerABI_C.bin new file mode 100755 index 0000000..80ce98d Binary files /dev/null and b/CMakeFiles/3.17.0/CMakeDetermineCompilerABI_C.bin differ diff --git a/CMakeFiles/3.17.0/CMakeDetermineCompilerABI_CXX.bin b/CMakeFiles/3.17.0/CMakeDetermineCompilerABI_CXX.bin new file mode 100755 index 0000000..a45ab83 Binary files /dev/null and b/CMakeFiles/3.17.0/CMakeDetermineCompilerABI_CXX.bin differ diff --git a/CMakeFiles/3.17.0/CMakeSystem.cmake b/CMakeFiles/3.17.0/CMakeSystem.cmake new file mode 100644 index 0000000..d5e229c --- /dev/null +++ b/CMakeFiles/3.17.0/CMakeSystem.cmake @@ -0,0 +1,15 @@ +set(CMAKE_HOST_SYSTEM "Linux-5.5.11-1-MANJARO") +set(CMAKE_HOST_SYSTEM_NAME "Linux") +set(CMAKE_HOST_SYSTEM_VERSION "5.5.11-1-MANJARO") +set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") + + + +set(CMAKE_SYSTEM "Linux-5.5.11-1-MANJARO") +set(CMAKE_SYSTEM_NAME "Linux") +set(CMAKE_SYSTEM_VERSION "5.5.11-1-MANJARO") +set(CMAKE_SYSTEM_PROCESSOR "x86_64") + +set(CMAKE_CROSSCOMPILING "FALSE") + +set(CMAKE_SYSTEM_LOADED 1) diff --git a/CMakeFiles/3.17.0/CompilerIdC/CMakeCCompilerId.c b/CMakeFiles/3.17.0/CompilerIdC/CMakeCCompilerId.c new file mode 100644 index 0000000..d884b50 --- /dev/null +++ b/CMakeFiles/3.17.0/CompilerIdC/CMakeCCompilerId.c @@ -0,0 +1,671 @@ +#ifdef __cplusplus +# error "A C++ compiler has been selected for C." +#endif + +#if defined(__18CXX) +# define ID_VOID_MAIN +#endif +#if defined(__CLASSIC_C__) +/* cv-qualifiers did not exist in K&R C */ +# define const +# define volatile +#endif + + +/* Version number components: V=Version, R=Revision, P=Patch + Version date components: YYYY=Year, MM=Month, DD=Day */ + +#if defined(__INTEL_COMPILER) || defined(__ICC) +# define COMPILER_ID "Intel" +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +# endif +# if defined(__GNUC__) +# define SIMULATE_ID "GNU" +# endif + /* __INTEL_COMPILER = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100) +# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10) +# if defined(__INTEL_COMPILER_UPDATE) +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE) +# else +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10) +# endif +# if defined(__INTEL_COMPILER_BUILD_DATE) + /* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */ +# define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) +# endif +# if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif +# if defined(__GNUC__) +# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) +# elif defined(__GNUG__) +# define SIMULATE_VERSION_MAJOR DEC(__GNUG__) +# endif +# if defined(__GNUC_MINOR__) +# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) +# endif +# if defined(__GNUC_PATCHLEVEL__) +# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) +# endif + +#elif defined(__PATHCC__) +# define COMPILER_ID "PathScale" +# define COMPILER_VERSION_MAJOR DEC(__PATHCC__) +# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__) +# if defined(__PATHCC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__) +# endif + +#elif defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__) +# define COMPILER_ID "Embarcadero" +# define COMPILER_VERSION_MAJOR HEX(__CODEGEARC_VERSION__>>24 & 0x00FF) +# define COMPILER_VERSION_MINOR HEX(__CODEGEARC_VERSION__>>16 & 0x00FF) +# define COMPILER_VERSION_PATCH DEC(__CODEGEARC_VERSION__ & 0xFFFF) + +#elif defined(__BORLANDC__) +# define COMPILER_ID "Borland" + /* __BORLANDC__ = 0xVRR */ +# define COMPILER_VERSION_MAJOR HEX(__BORLANDC__>>8) +# define COMPILER_VERSION_MINOR HEX(__BORLANDC__ & 0xFF) + +#elif defined(__WATCOMC__) && __WATCOMC__ < 1200 +# define COMPILER_ID "Watcom" + /* __WATCOMC__ = VVRR */ +# define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100) +# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) +# if (__WATCOMC__ % 10) > 0 +# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) +# endif + +#elif defined(__WATCOMC__) +# define COMPILER_ID "OpenWatcom" + /* __WATCOMC__ = VVRP + 1100 */ +# define COMPILER_VERSION_MAJOR DEC((__WATCOMC__ - 1100) / 100) +# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) +# if (__WATCOMC__ % 10) > 0 +# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) +# endif + +#elif defined(__SUNPRO_C) +# define COMPILER_ID "SunPro" +# if __SUNPRO_C >= 0x5100 + /* __SUNPRO_C = 0xVRRP */ +# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>12) +# define COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xFF) +# define COMPILER_VERSION_PATCH HEX(__SUNPRO_C & 0xF) +# else + /* __SUNPRO_CC = 0xVRP */ +# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>8) +# define COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xF) +# define COMPILER_VERSION_PATCH HEX(__SUNPRO_C & 0xF) +# endif + +#elif defined(__HP_cc) +# define COMPILER_ID "HP" + /* __HP_cc = VVRRPP */ +# define COMPILER_VERSION_MAJOR DEC(__HP_cc/10000) +# define COMPILER_VERSION_MINOR DEC(__HP_cc/100 % 100) +# define COMPILER_VERSION_PATCH DEC(__HP_cc % 100) + +#elif defined(__DECC) +# define COMPILER_ID "Compaq" + /* __DECC_VER = VVRRTPPPP */ +# define COMPILER_VERSION_MAJOR DEC(__DECC_VER/10000000) +# define COMPILER_VERSION_MINOR DEC(__DECC_VER/100000 % 100) +# define COMPILER_VERSION_PATCH DEC(__DECC_VER % 10000) + +#elif defined(__IBMC__) && defined(__COMPILER_VER__) +# define COMPILER_ID "zOS" + /* __IBMC__ = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__IBMC__/100) +# define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) + +#elif defined(__ibmxl__) && defined(__clang__) +# define COMPILER_ID "XLClang" +# define COMPILER_VERSION_MAJOR DEC(__ibmxl_version__) +# define COMPILER_VERSION_MINOR DEC(__ibmxl_release__) +# define COMPILER_VERSION_PATCH DEC(__ibmxl_modification__) +# define COMPILER_VERSION_TWEAK DEC(__ibmxl_ptf_fix_level__) + + +#elif defined(__IBMC__) && !defined(__COMPILER_VER__) && __IBMC__ >= 800 +# define COMPILER_ID "XL" + /* __IBMC__ = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__IBMC__/100) +# define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) + +#elif defined(__IBMC__) && !defined(__COMPILER_VER__) && __IBMC__ < 800 +# define COMPILER_ID "VisualAge" + /* __IBMC__ = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__IBMC__/100) +# define COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__IBMC__ % 10) + +#elif defined(__PGI) +# define COMPILER_ID "PGI" +# define COMPILER_VERSION_MAJOR DEC(__PGIC__) +# define COMPILER_VERSION_MINOR DEC(__PGIC_MINOR__) +# if defined(__PGIC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__) +# endif + +#elif defined(_CRAYC) +# define COMPILER_ID "Cray" +# define COMPILER_VERSION_MAJOR DEC(_RELEASE_MAJOR) +# define COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR) + +#elif defined(__TI_COMPILER_VERSION__) +# define COMPILER_ID "TI" + /* __TI_COMPILER_VERSION__ = VVVRRRPPP */ +# define COMPILER_VERSION_MAJOR DEC(__TI_COMPILER_VERSION__/1000000) +# define COMPILER_VERSION_MINOR DEC(__TI_COMPILER_VERSION__/1000 % 1000) +# define COMPILER_VERSION_PATCH DEC(__TI_COMPILER_VERSION__ % 1000) + +#elif defined(__FUJITSU) || defined(__FCC_VERSION) || defined(__fcc_version) +# define COMPILER_ID "Fujitsu" + +#elif defined(__ghs__) +# define COMPILER_ID "GHS" +/* __GHS_VERSION_NUMBER = VVVVRP */ +# ifdef __GHS_VERSION_NUMBER +# define COMPILER_VERSION_MAJOR DEC(__GHS_VERSION_NUMBER / 100) +# define COMPILER_VERSION_MINOR DEC(__GHS_VERSION_NUMBER / 10 % 10) +# define COMPILER_VERSION_PATCH DEC(__GHS_VERSION_NUMBER % 10) +# endif + +#elif defined(__TINYC__) +# define COMPILER_ID "TinyCC" + +#elif defined(__BCC__) +# define COMPILER_ID "Bruce" + +#elif defined(__SCO_VERSION__) +# define COMPILER_ID "SCO" + +#elif defined(__ARMCC_VERSION) && !defined(__clang__) +# define COMPILER_ID "ARMCC" +#if __ARMCC_VERSION >= 1000000 + /* __ARMCC_VERSION = VRRPPPP */ + # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/1000000) + # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 100) + # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) +#else + /* __ARMCC_VERSION = VRPPPP */ + # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/100000) + # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 10) + # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) +#endif + + +#elif defined(__clang__) && defined(__apple_build_version__) +# define COMPILER_ID "AppleClang" +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +# endif +# define COMPILER_VERSION_MAJOR DEC(__clang_major__) +# define COMPILER_VERSION_MINOR DEC(__clang_minor__) +# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) +# if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif +# define COMPILER_VERSION_TWEAK DEC(__apple_build_version__) + +#elif defined(__clang__) && defined(__ARMCOMPILER_VERSION) +# define COMPILER_ID "ARMClang" + # define COMPILER_VERSION_MAJOR DEC(__ARMCOMPILER_VERSION/1000000) + # define COMPILER_VERSION_MINOR DEC(__ARMCOMPILER_VERSION/10000 % 100) + # define COMPILER_VERSION_PATCH DEC(__ARMCOMPILER_VERSION % 10000) +# define COMPILER_VERSION_INTERNAL DEC(__ARMCOMPILER_VERSION) + +#elif defined(__clang__) +# define COMPILER_ID "Clang" +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +# endif +# define COMPILER_VERSION_MAJOR DEC(__clang_major__) +# define COMPILER_VERSION_MINOR DEC(__clang_minor__) +# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) +# if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif + +#elif defined(__GNUC__) +# define COMPILER_ID "GNU" +# define COMPILER_VERSION_MAJOR DEC(__GNUC__) +# if defined(__GNUC_MINOR__) +# define COMPILER_VERSION_MINOR DEC(__GNUC_MINOR__) +# endif +# if defined(__GNUC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) +# endif + +#elif defined(_MSC_VER) +# define COMPILER_ID "MSVC" + /* _MSC_VER = VVRR */ +# define COMPILER_VERSION_MAJOR DEC(_MSC_VER / 100) +# define COMPILER_VERSION_MINOR DEC(_MSC_VER % 100) +# if defined(_MSC_FULL_VER) +# if _MSC_VER >= 1400 + /* _MSC_FULL_VER = VVRRPPPPP */ +# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 100000) +# else + /* _MSC_FULL_VER = VVRRPPPP */ +# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 10000) +# endif +# endif +# if defined(_MSC_BUILD) +# define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD) +# endif + +#elif defined(__VISUALDSPVERSION__) || defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__) +# define COMPILER_ID "ADSP" +#if defined(__VISUALDSPVERSION__) + /* __VISUALDSPVERSION__ = 0xVVRRPP00 */ +# define COMPILER_VERSION_MAJOR HEX(__VISUALDSPVERSION__>>24) +# define COMPILER_VERSION_MINOR HEX(__VISUALDSPVERSION__>>16 & 0xFF) +# define COMPILER_VERSION_PATCH HEX(__VISUALDSPVERSION__>>8 & 0xFF) +#endif + +#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) +# define COMPILER_ID "IAR" +# if defined(__VER__) && defined(__ICCARM__) +# define COMPILER_VERSION_MAJOR DEC((__VER__) / 1000000) +# define COMPILER_VERSION_MINOR DEC(((__VER__) / 1000) % 1000) +# define COMPILER_VERSION_PATCH DEC((__VER__) % 1000) +# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) +# elif defined(__VER__) && (defined(__ICCAVR__) || defined(__ICCRX__) || defined(__ICCRH850__) || defined(__ICCRL78__) || defined(__ICC430__) || defined(__ICCRISCV__) || defined(__ICCV850__) || defined(__ICC8051__)) +# define COMPILER_VERSION_MAJOR DEC((__VER__) / 100) +# define COMPILER_VERSION_MINOR DEC((__VER__) - (((__VER__) / 100)*100)) +# define COMPILER_VERSION_PATCH DEC(__SUBVERSION__) +# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) +# endif + +#elif defined(__SDCC_VERSION_MAJOR) || defined(SDCC) +# define COMPILER_ID "SDCC" +# if defined(__SDCC_VERSION_MAJOR) +# define COMPILER_VERSION_MAJOR DEC(__SDCC_VERSION_MAJOR) +# define COMPILER_VERSION_MINOR DEC(__SDCC_VERSION_MINOR) +# define COMPILER_VERSION_PATCH DEC(__SDCC_VERSION_PATCH) +# else + /* SDCC = VRP */ +# define COMPILER_VERSION_MAJOR DEC(SDCC/100) +# define COMPILER_VERSION_MINOR DEC(SDCC/10 % 10) +# define COMPILER_VERSION_PATCH DEC(SDCC % 10) +# endif + + +/* These compilers are either not known or too old to define an + identification macro. Try to identify the platform and guess that + it is the native compiler. */ +#elif defined(__hpux) || defined(__hpua) +# define COMPILER_ID "HP" + +#else /* unknown compiler */ +# define COMPILER_ID "" +#endif + +/* Construct the string literal in pieces to prevent the source from + getting matched. Store it in a pointer rather than an array + because some compilers will just produce instructions to fill the + array rather than assigning a pointer to a static array. */ +char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]"; +#ifdef SIMULATE_ID +char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; +#endif + +#ifdef __QNXNTO__ +char const* qnxnto = "INFO" ":" "qnxnto[]"; +#endif + +#if defined(__CRAYXE) || defined(__CRAYXC) +char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; +#endif + +#define STRINGIFY_HELPER(X) #X +#define STRINGIFY(X) STRINGIFY_HELPER(X) + +/* Identify known platforms by name. */ +#if defined(__linux) || defined(__linux__) || defined(linux) +# define PLATFORM_ID "Linux" + +#elif defined(__CYGWIN__) +# define PLATFORM_ID "Cygwin" + +#elif defined(__MINGW32__) +# define PLATFORM_ID "MinGW" + +#elif defined(__APPLE__) +# define PLATFORM_ID "Darwin" + +#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) +# define PLATFORM_ID "Windows" + +#elif defined(__FreeBSD__) || defined(__FreeBSD) +# define PLATFORM_ID "FreeBSD" + +#elif defined(__NetBSD__) || defined(__NetBSD) +# define PLATFORM_ID "NetBSD" + +#elif defined(__OpenBSD__) || defined(__OPENBSD) +# define PLATFORM_ID "OpenBSD" + +#elif defined(__sun) || defined(sun) +# define PLATFORM_ID "SunOS" + +#elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__) +# define PLATFORM_ID "AIX" + +#elif defined(__hpux) || defined(__hpux__) +# define PLATFORM_ID "HP-UX" + +#elif defined(__HAIKU__) +# define PLATFORM_ID "Haiku" + +#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) +# define PLATFORM_ID "BeOS" + +#elif defined(__QNX__) || defined(__QNXNTO__) +# define PLATFORM_ID "QNX" + +#elif defined(__tru64) || defined(_tru64) || defined(__TRU64__) +# define PLATFORM_ID "Tru64" + +#elif defined(__riscos) || defined(__riscos__) +# define PLATFORM_ID "RISCos" + +#elif defined(__sinix) || defined(__sinix__) || defined(__SINIX__) +# define PLATFORM_ID "SINIX" + +#elif defined(__UNIX_SV__) +# define PLATFORM_ID "UNIX_SV" + +#elif defined(__bsdos__) +# define PLATFORM_ID "BSDOS" + +#elif defined(_MPRAS) || defined(MPRAS) +# define PLATFORM_ID "MP-RAS" + +#elif defined(__osf) || defined(__osf__) +# define PLATFORM_ID "OSF1" + +#elif defined(_SCO_SV) || defined(SCO_SV) || defined(sco_sv) +# define PLATFORM_ID "SCO_SV" + +#elif defined(__ultrix) || defined(__ultrix__) || defined(_ULTRIX) +# define PLATFORM_ID "ULTRIX" + +#elif defined(__XENIX__) || defined(_XENIX) || defined(XENIX) +# define PLATFORM_ID "Xenix" + +#elif defined(__WATCOMC__) +# if defined(__LINUX__) +# define PLATFORM_ID "Linux" + +# elif defined(__DOS__) +# define PLATFORM_ID "DOS" + +# elif defined(__OS2__) +# define PLATFORM_ID "OS2" + +# elif defined(__WINDOWS__) +# define PLATFORM_ID "Windows3x" + +# else /* unknown platform */ +# define PLATFORM_ID +# endif + +#elif defined(__INTEGRITY) +# if defined(INT_178B) +# define PLATFORM_ID "Integrity178" + +# else /* regular Integrity */ +# define PLATFORM_ID "Integrity" +# endif + +#else /* unknown platform */ +# define PLATFORM_ID + +#endif + +/* For windows compilers MSVC and Intel we can determine + the architecture of the compiler being used. This is because + the compilers do not have flags that can change the architecture, + but rather depend on which compiler is being used +*/ +#if defined(_WIN32) && defined(_MSC_VER) +# if defined(_M_IA64) +# define ARCHITECTURE_ID "IA64" + +# elif defined(_M_X64) || defined(_M_AMD64) +# define ARCHITECTURE_ID "x64" + +# elif defined(_M_IX86) +# define ARCHITECTURE_ID "X86" + +# elif defined(_M_ARM64) +# define ARCHITECTURE_ID "ARM64" + +# elif defined(_M_ARM) +# if _M_ARM == 4 +# define ARCHITECTURE_ID "ARMV4I" +# elif _M_ARM == 5 +# define ARCHITECTURE_ID "ARMV5I" +# else +# define ARCHITECTURE_ID "ARMV" STRINGIFY(_M_ARM) +# endif + +# elif defined(_M_MIPS) +# define ARCHITECTURE_ID "MIPS" + +# elif defined(_M_SH) +# define ARCHITECTURE_ID "SHx" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__WATCOMC__) +# if defined(_M_I86) +# define ARCHITECTURE_ID "I86" + +# elif defined(_M_IX86) +# define ARCHITECTURE_ID "X86" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) +# if defined(__ICCARM__) +# define ARCHITECTURE_ID "ARM" + +# elif defined(__ICCRX__) +# define ARCHITECTURE_ID "RX" + +# elif defined(__ICCRH850__) +# define ARCHITECTURE_ID "RH850" + +# elif defined(__ICCRL78__) +# define ARCHITECTURE_ID "RL78" + +# elif defined(__ICCRISCV__) +# define ARCHITECTURE_ID "RISCV" + +# elif defined(__ICCAVR__) +# define ARCHITECTURE_ID "AVR" + +# elif defined(__ICC430__) +# define ARCHITECTURE_ID "MSP430" + +# elif defined(__ICCV850__) +# define ARCHITECTURE_ID "V850" + +# elif defined(__ICC8051__) +# define ARCHITECTURE_ID "8051" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__ghs__) +# if defined(__PPC64__) +# define ARCHITECTURE_ID "PPC64" + +# elif defined(__ppc__) +# define ARCHITECTURE_ID "PPC" + +# elif defined(__ARM__) +# define ARCHITECTURE_ID "ARM" + +# elif defined(__x86_64__) +# define ARCHITECTURE_ID "x64" + +# elif defined(__i386__) +# define ARCHITECTURE_ID "X86" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif +#else +# define ARCHITECTURE_ID +#endif + +/* Convert integer to decimal digit literals. */ +#define DEC(n) \ + ('0' + (((n) / 10000000)%10)), \ + ('0' + (((n) / 1000000)%10)), \ + ('0' + (((n) / 100000)%10)), \ + ('0' + (((n) / 10000)%10)), \ + ('0' + (((n) / 1000)%10)), \ + ('0' + (((n) / 100)%10)), \ + ('0' + (((n) / 10)%10)), \ + ('0' + ((n) % 10)) + +/* Convert integer to hex digit literals. */ +#define HEX(n) \ + ('0' + ((n)>>28 & 0xF)), \ + ('0' + ((n)>>24 & 0xF)), \ + ('0' + ((n)>>20 & 0xF)), \ + ('0' + ((n)>>16 & 0xF)), \ + ('0' + ((n)>>12 & 0xF)), \ + ('0' + ((n)>>8 & 0xF)), \ + ('0' + ((n)>>4 & 0xF)), \ + ('0' + ((n) & 0xF)) + +/* Construct a string literal encoding the version number components. */ +#ifdef COMPILER_VERSION_MAJOR +char const info_version[] = { + 'I', 'N', 'F', 'O', ':', + 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','[', + COMPILER_VERSION_MAJOR, +# ifdef COMPILER_VERSION_MINOR + '.', COMPILER_VERSION_MINOR, +# ifdef COMPILER_VERSION_PATCH + '.', COMPILER_VERSION_PATCH, +# ifdef COMPILER_VERSION_TWEAK + '.', COMPILER_VERSION_TWEAK, +# endif +# endif +# endif + ']','\0'}; +#endif + +/* Construct a string literal encoding the internal version number. */ +#ifdef COMPILER_VERSION_INTERNAL +char const info_version_internal[] = { + 'I', 'N', 'F', 'O', ':', + 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','_', + 'i','n','t','e','r','n','a','l','[', + COMPILER_VERSION_INTERNAL,']','\0'}; +#endif + +/* Construct a string literal encoding the version number components. */ +#ifdef SIMULATE_VERSION_MAJOR +char const info_simulate_version[] = { + 'I', 'N', 'F', 'O', ':', + 's','i','m','u','l','a','t','e','_','v','e','r','s','i','o','n','[', + SIMULATE_VERSION_MAJOR, +# ifdef SIMULATE_VERSION_MINOR + '.', SIMULATE_VERSION_MINOR, +# ifdef SIMULATE_VERSION_PATCH + '.', SIMULATE_VERSION_PATCH, +# ifdef SIMULATE_VERSION_TWEAK + '.', SIMULATE_VERSION_TWEAK, +# endif +# endif +# endif + ']','\0'}; +#endif + +/* Construct the string literal in pieces to prevent the source from + getting matched. Store it in a pointer rather than an array + because some compilers will just produce instructions to fill the + array rather than assigning a pointer to a static array. */ +char const* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]"; +char const* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]"; + + + + +#if !defined(__STDC__) +# if (defined(_MSC_VER) && !defined(__clang__)) \ + || (defined(__ibmxl__) || defined(__IBMC__)) +# define C_DIALECT "90" +# else +# define C_DIALECT +# endif +#elif __STDC_VERSION__ >= 201000L +# define C_DIALECT "11" +#elif __STDC_VERSION__ >= 199901L +# define C_DIALECT "99" +#else +# define C_DIALECT "90" +#endif +const char* info_language_dialect_default = + "INFO" ":" "dialect_default[" C_DIALECT "]"; + +/*--------------------------------------------------------------------------*/ + +#ifdef ID_VOID_MAIN +void main() {} +#else +# if defined(__CLASSIC_C__) +int main(argc, argv) int argc; char *argv[]; +# else +int main(int argc, char* argv[]) +# endif +{ + int require = 0; + require += info_compiler[argc]; + require += info_platform[argc]; + require += info_arch[argc]; +#ifdef COMPILER_VERSION_MAJOR + require += info_version[argc]; +#endif +#ifdef COMPILER_VERSION_INTERNAL + require += info_version_internal[argc]; +#endif +#ifdef SIMULATE_ID + require += info_simulate[argc]; +#endif +#ifdef SIMULATE_VERSION_MAJOR + require += info_simulate_version[argc]; +#endif +#if defined(__CRAYXE) || defined(__CRAYXC) + require += info_cray[argc]; +#endif + require += info_language_dialect_default[argc]; + (void)argv; + return require; +} +#endif diff --git a/CMakeFiles/3.17.0/CompilerIdC/a.out b/CMakeFiles/3.17.0/CompilerIdC/a.out new file mode 100755 index 0000000..ab0ed85 Binary files /dev/null and b/CMakeFiles/3.17.0/CompilerIdC/a.out differ diff --git a/CMakeFiles/3.17.0/CompilerIdCXX/CMakeCXXCompilerId.cpp b/CMakeFiles/3.17.0/CompilerIdCXX/CMakeCXXCompilerId.cpp new file mode 100644 index 0000000..69cfdba --- /dev/null +++ b/CMakeFiles/3.17.0/CompilerIdCXX/CMakeCXXCompilerId.cpp @@ -0,0 +1,660 @@ +/* This source file must have a .cpp extension so that all C++ compilers + recognize the extension without flags. Borland does not know .cxx for + example. */ +#ifndef __cplusplus +# error "A C compiler has been selected for C++." +#endif + + +/* Version number components: V=Version, R=Revision, P=Patch + Version date components: YYYY=Year, MM=Month, DD=Day */ + +#if defined(__COMO__) +# define COMPILER_ID "Comeau" + /* __COMO_VERSION__ = VRR */ +# define COMPILER_VERSION_MAJOR DEC(__COMO_VERSION__ / 100) +# define COMPILER_VERSION_MINOR DEC(__COMO_VERSION__ % 100) + +#elif defined(__INTEL_COMPILER) || defined(__ICC) +# define COMPILER_ID "Intel" +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +# endif +# if defined(__GNUC__) +# define SIMULATE_ID "GNU" +# endif + /* __INTEL_COMPILER = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100) +# define COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10) +# if defined(__INTEL_COMPILER_UPDATE) +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE) +# else +# define COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10) +# endif +# if defined(__INTEL_COMPILER_BUILD_DATE) + /* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */ +# define COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE) +# endif +# if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif +# if defined(__GNUC__) +# define SIMULATE_VERSION_MAJOR DEC(__GNUC__) +# elif defined(__GNUG__) +# define SIMULATE_VERSION_MAJOR DEC(__GNUG__) +# endif +# if defined(__GNUC_MINOR__) +# define SIMULATE_VERSION_MINOR DEC(__GNUC_MINOR__) +# endif +# if defined(__GNUC_PATCHLEVEL__) +# define SIMULATE_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) +# endif + +#elif defined(__PATHCC__) +# define COMPILER_ID "PathScale" +# define COMPILER_VERSION_MAJOR DEC(__PATHCC__) +# define COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__) +# if defined(__PATHCC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__) +# endif + +#elif defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__) +# define COMPILER_ID "Embarcadero" +# define COMPILER_VERSION_MAJOR HEX(__CODEGEARC_VERSION__>>24 & 0x00FF) +# define COMPILER_VERSION_MINOR HEX(__CODEGEARC_VERSION__>>16 & 0x00FF) +# define COMPILER_VERSION_PATCH DEC(__CODEGEARC_VERSION__ & 0xFFFF) + +#elif defined(__BORLANDC__) +# define COMPILER_ID "Borland" + /* __BORLANDC__ = 0xVRR */ +# define COMPILER_VERSION_MAJOR HEX(__BORLANDC__>>8) +# define COMPILER_VERSION_MINOR HEX(__BORLANDC__ & 0xFF) + +#elif defined(__WATCOMC__) && __WATCOMC__ < 1200 +# define COMPILER_ID "Watcom" + /* __WATCOMC__ = VVRR */ +# define COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100) +# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) +# if (__WATCOMC__ % 10) > 0 +# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) +# endif + +#elif defined(__WATCOMC__) +# define COMPILER_ID "OpenWatcom" + /* __WATCOMC__ = VVRP + 1100 */ +# define COMPILER_VERSION_MAJOR DEC((__WATCOMC__ - 1100) / 100) +# define COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10) +# if (__WATCOMC__ % 10) > 0 +# define COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10) +# endif + +#elif defined(__SUNPRO_CC) +# define COMPILER_ID "SunPro" +# if __SUNPRO_CC >= 0x5100 + /* __SUNPRO_CC = 0xVRRP */ +# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_CC>>12) +# define COMPILER_VERSION_MINOR HEX(__SUNPRO_CC>>4 & 0xFF) +# define COMPILER_VERSION_PATCH HEX(__SUNPRO_CC & 0xF) +# else + /* __SUNPRO_CC = 0xVRP */ +# define COMPILER_VERSION_MAJOR HEX(__SUNPRO_CC>>8) +# define COMPILER_VERSION_MINOR HEX(__SUNPRO_CC>>4 & 0xF) +# define COMPILER_VERSION_PATCH HEX(__SUNPRO_CC & 0xF) +# endif + +#elif defined(__HP_aCC) +# define COMPILER_ID "HP" + /* __HP_aCC = VVRRPP */ +# define COMPILER_VERSION_MAJOR DEC(__HP_aCC/10000) +# define COMPILER_VERSION_MINOR DEC(__HP_aCC/100 % 100) +# define COMPILER_VERSION_PATCH DEC(__HP_aCC % 100) + +#elif defined(__DECCXX) +# define COMPILER_ID "Compaq" + /* __DECCXX_VER = VVRRTPPPP */ +# define COMPILER_VERSION_MAJOR DEC(__DECCXX_VER/10000000) +# define COMPILER_VERSION_MINOR DEC(__DECCXX_VER/100000 % 100) +# define COMPILER_VERSION_PATCH DEC(__DECCXX_VER % 10000) + +#elif defined(__IBMCPP__) && defined(__COMPILER_VER__) +# define COMPILER_ID "zOS" + /* __IBMCPP__ = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__IBMCPP__/100) +# define COMPILER_VERSION_MINOR DEC(__IBMCPP__/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__IBMCPP__ % 10) + +#elif defined(__ibmxl__) && defined(__clang__) +# define COMPILER_ID "XLClang" +# define COMPILER_VERSION_MAJOR DEC(__ibmxl_version__) +# define COMPILER_VERSION_MINOR DEC(__ibmxl_release__) +# define COMPILER_VERSION_PATCH DEC(__ibmxl_modification__) +# define COMPILER_VERSION_TWEAK DEC(__ibmxl_ptf_fix_level__) + + +#elif defined(__IBMCPP__) && !defined(__COMPILER_VER__) && __IBMCPP__ >= 800 +# define COMPILER_ID "XL" + /* __IBMCPP__ = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__IBMCPP__/100) +# define COMPILER_VERSION_MINOR DEC(__IBMCPP__/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__IBMCPP__ % 10) + +#elif defined(__IBMCPP__) && !defined(__COMPILER_VER__) && __IBMCPP__ < 800 +# define COMPILER_ID "VisualAge" + /* __IBMCPP__ = VRP */ +# define COMPILER_VERSION_MAJOR DEC(__IBMCPP__/100) +# define COMPILER_VERSION_MINOR DEC(__IBMCPP__/10 % 10) +# define COMPILER_VERSION_PATCH DEC(__IBMCPP__ % 10) + +#elif defined(__PGI) +# define COMPILER_ID "PGI" +# define COMPILER_VERSION_MAJOR DEC(__PGIC__) +# define COMPILER_VERSION_MINOR DEC(__PGIC_MINOR__) +# if defined(__PGIC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__) +# endif + +#elif defined(_CRAYC) +# define COMPILER_ID "Cray" +# define COMPILER_VERSION_MAJOR DEC(_RELEASE_MAJOR) +# define COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR) + +#elif defined(__TI_COMPILER_VERSION__) +# define COMPILER_ID "TI" + /* __TI_COMPILER_VERSION__ = VVVRRRPPP */ +# define COMPILER_VERSION_MAJOR DEC(__TI_COMPILER_VERSION__/1000000) +# define COMPILER_VERSION_MINOR DEC(__TI_COMPILER_VERSION__/1000 % 1000) +# define COMPILER_VERSION_PATCH DEC(__TI_COMPILER_VERSION__ % 1000) + +#elif defined(__FUJITSU) || defined(__FCC_VERSION) || defined(__fcc_version) +# define COMPILER_ID "Fujitsu" + +#elif defined(__ghs__) +# define COMPILER_ID "GHS" +/* __GHS_VERSION_NUMBER = VVVVRP */ +# ifdef __GHS_VERSION_NUMBER +# define COMPILER_VERSION_MAJOR DEC(__GHS_VERSION_NUMBER / 100) +# define COMPILER_VERSION_MINOR DEC(__GHS_VERSION_NUMBER / 10 % 10) +# define COMPILER_VERSION_PATCH DEC(__GHS_VERSION_NUMBER % 10) +# endif + +#elif defined(__SCO_VERSION__) +# define COMPILER_ID "SCO" + +#elif defined(__ARMCC_VERSION) && !defined(__clang__) +# define COMPILER_ID "ARMCC" +#if __ARMCC_VERSION >= 1000000 + /* __ARMCC_VERSION = VRRPPPP */ + # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/1000000) + # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 100) + # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) +#else + /* __ARMCC_VERSION = VRPPPP */ + # define COMPILER_VERSION_MAJOR DEC(__ARMCC_VERSION/100000) + # define COMPILER_VERSION_MINOR DEC(__ARMCC_VERSION/10000 % 10) + # define COMPILER_VERSION_PATCH DEC(__ARMCC_VERSION % 10000) +#endif + + +#elif defined(__clang__) && defined(__apple_build_version__) +# define COMPILER_ID "AppleClang" +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +# endif +# define COMPILER_VERSION_MAJOR DEC(__clang_major__) +# define COMPILER_VERSION_MINOR DEC(__clang_minor__) +# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) +# if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif +# define COMPILER_VERSION_TWEAK DEC(__apple_build_version__) + +#elif defined(__clang__) && defined(__ARMCOMPILER_VERSION) +# define COMPILER_ID "ARMClang" + # define COMPILER_VERSION_MAJOR DEC(__ARMCOMPILER_VERSION/1000000) + # define COMPILER_VERSION_MINOR DEC(__ARMCOMPILER_VERSION/10000 % 100) + # define COMPILER_VERSION_PATCH DEC(__ARMCOMPILER_VERSION % 10000) +# define COMPILER_VERSION_INTERNAL DEC(__ARMCOMPILER_VERSION) + +#elif defined(__clang__) +# define COMPILER_ID "Clang" +# if defined(_MSC_VER) +# define SIMULATE_ID "MSVC" +# endif +# define COMPILER_VERSION_MAJOR DEC(__clang_major__) +# define COMPILER_VERSION_MINOR DEC(__clang_minor__) +# define COMPILER_VERSION_PATCH DEC(__clang_patchlevel__) +# if defined(_MSC_VER) + /* _MSC_VER = VVRR */ +# define SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100) +# define SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100) +# endif + +#elif defined(__GNUC__) || defined(__GNUG__) +# define COMPILER_ID "GNU" +# if defined(__GNUC__) +# define COMPILER_VERSION_MAJOR DEC(__GNUC__) +# else +# define COMPILER_VERSION_MAJOR DEC(__GNUG__) +# endif +# if defined(__GNUC_MINOR__) +# define COMPILER_VERSION_MINOR DEC(__GNUC_MINOR__) +# endif +# if defined(__GNUC_PATCHLEVEL__) +# define COMPILER_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__) +# endif + +#elif defined(_MSC_VER) +# define COMPILER_ID "MSVC" + /* _MSC_VER = VVRR */ +# define COMPILER_VERSION_MAJOR DEC(_MSC_VER / 100) +# define COMPILER_VERSION_MINOR DEC(_MSC_VER % 100) +# if defined(_MSC_FULL_VER) +# if _MSC_VER >= 1400 + /* _MSC_FULL_VER = VVRRPPPPP */ +# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 100000) +# else + /* _MSC_FULL_VER = VVRRPPPP */ +# define COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 10000) +# endif +# endif +# if defined(_MSC_BUILD) +# define COMPILER_VERSION_TWEAK DEC(_MSC_BUILD) +# endif + +#elif defined(__VISUALDSPVERSION__) || defined(__ADSPBLACKFIN__) || defined(__ADSPTS__) || defined(__ADSP21000__) +# define COMPILER_ID "ADSP" +#if defined(__VISUALDSPVERSION__) + /* __VISUALDSPVERSION__ = 0xVVRRPP00 */ +# define COMPILER_VERSION_MAJOR HEX(__VISUALDSPVERSION__>>24) +# define COMPILER_VERSION_MINOR HEX(__VISUALDSPVERSION__>>16 & 0xFF) +# define COMPILER_VERSION_PATCH HEX(__VISUALDSPVERSION__>>8 & 0xFF) +#endif + +#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) +# define COMPILER_ID "IAR" +# if defined(__VER__) && defined(__ICCARM__) +# define COMPILER_VERSION_MAJOR DEC((__VER__) / 1000000) +# define COMPILER_VERSION_MINOR DEC(((__VER__) / 1000) % 1000) +# define COMPILER_VERSION_PATCH DEC((__VER__) % 1000) +# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) +# elif defined(__VER__) && (defined(__ICCAVR__) || defined(__ICCRX__) || defined(__ICCRH850__) || defined(__ICCRL78__) || defined(__ICC430__) || defined(__ICCRISCV__) || defined(__ICCV850__) || defined(__ICC8051__)) +# define COMPILER_VERSION_MAJOR DEC((__VER__) / 100) +# define COMPILER_VERSION_MINOR DEC((__VER__) - (((__VER__) / 100)*100)) +# define COMPILER_VERSION_PATCH DEC(__SUBVERSION__) +# define COMPILER_VERSION_INTERNAL DEC(__IAR_SYSTEMS_ICC__) +# endif + + +/* These compilers are either not known or too old to define an + identification macro. Try to identify the platform and guess that + it is the native compiler. */ +#elif defined(__hpux) || defined(__hpua) +# define COMPILER_ID "HP" + +#else /* unknown compiler */ +# define COMPILER_ID "" +#endif + +/* Construct the string literal in pieces to prevent the source from + getting matched. Store it in a pointer rather than an array + because some compilers will just produce instructions to fill the + array rather than assigning a pointer to a static array. */ +char const* info_compiler = "INFO" ":" "compiler[" COMPILER_ID "]"; +#ifdef SIMULATE_ID +char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; +#endif + +#ifdef __QNXNTO__ +char const* qnxnto = "INFO" ":" "qnxnto[]"; +#endif + +#if defined(__CRAYXE) || defined(__CRAYXC) +char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; +#endif + +#define STRINGIFY_HELPER(X) #X +#define STRINGIFY(X) STRINGIFY_HELPER(X) + +/* Identify known platforms by name. */ +#if defined(__linux) || defined(__linux__) || defined(linux) +# define PLATFORM_ID "Linux" + +#elif defined(__CYGWIN__) +# define PLATFORM_ID "Cygwin" + +#elif defined(__MINGW32__) +# define PLATFORM_ID "MinGW" + +#elif defined(__APPLE__) +# define PLATFORM_ID "Darwin" + +#elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) +# define PLATFORM_ID "Windows" + +#elif defined(__FreeBSD__) || defined(__FreeBSD) +# define PLATFORM_ID "FreeBSD" + +#elif defined(__NetBSD__) || defined(__NetBSD) +# define PLATFORM_ID "NetBSD" + +#elif defined(__OpenBSD__) || defined(__OPENBSD) +# define PLATFORM_ID "OpenBSD" + +#elif defined(__sun) || defined(sun) +# define PLATFORM_ID "SunOS" + +#elif defined(_AIX) || defined(__AIX) || defined(__AIX__) || defined(__aix) || defined(__aix__) +# define PLATFORM_ID "AIX" + +#elif defined(__hpux) || defined(__hpux__) +# define PLATFORM_ID "HP-UX" + +#elif defined(__HAIKU__) +# define PLATFORM_ID "Haiku" + +#elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) +# define PLATFORM_ID "BeOS" + +#elif defined(__QNX__) || defined(__QNXNTO__) +# define PLATFORM_ID "QNX" + +#elif defined(__tru64) || defined(_tru64) || defined(__TRU64__) +# define PLATFORM_ID "Tru64" + +#elif defined(__riscos) || defined(__riscos__) +# define PLATFORM_ID "RISCos" + +#elif defined(__sinix) || defined(__sinix__) || defined(__SINIX__) +# define PLATFORM_ID "SINIX" + +#elif defined(__UNIX_SV__) +# define PLATFORM_ID "UNIX_SV" + +#elif defined(__bsdos__) +# define PLATFORM_ID "BSDOS" + +#elif defined(_MPRAS) || defined(MPRAS) +# define PLATFORM_ID "MP-RAS" + +#elif defined(__osf) || defined(__osf__) +# define PLATFORM_ID "OSF1" + +#elif defined(_SCO_SV) || defined(SCO_SV) || defined(sco_sv) +# define PLATFORM_ID "SCO_SV" + +#elif defined(__ultrix) || defined(__ultrix__) || defined(_ULTRIX) +# define PLATFORM_ID "ULTRIX" + +#elif defined(__XENIX__) || defined(_XENIX) || defined(XENIX) +# define PLATFORM_ID "Xenix" + +#elif defined(__WATCOMC__) +# if defined(__LINUX__) +# define PLATFORM_ID "Linux" + +# elif defined(__DOS__) +# define PLATFORM_ID "DOS" + +# elif defined(__OS2__) +# define PLATFORM_ID "OS2" + +# elif defined(__WINDOWS__) +# define PLATFORM_ID "Windows3x" + +# else /* unknown platform */ +# define PLATFORM_ID +# endif + +#elif defined(__INTEGRITY) +# if defined(INT_178B) +# define PLATFORM_ID "Integrity178" + +# else /* regular Integrity */ +# define PLATFORM_ID "Integrity" +# endif + +#else /* unknown platform */ +# define PLATFORM_ID + +#endif + +/* For windows compilers MSVC and Intel we can determine + the architecture of the compiler being used. This is because + the compilers do not have flags that can change the architecture, + but rather depend on which compiler is being used +*/ +#if defined(_WIN32) && defined(_MSC_VER) +# if defined(_M_IA64) +# define ARCHITECTURE_ID "IA64" + +# elif defined(_M_X64) || defined(_M_AMD64) +# define ARCHITECTURE_ID "x64" + +# elif defined(_M_IX86) +# define ARCHITECTURE_ID "X86" + +# elif defined(_M_ARM64) +# define ARCHITECTURE_ID "ARM64" + +# elif defined(_M_ARM) +# if _M_ARM == 4 +# define ARCHITECTURE_ID "ARMV4I" +# elif _M_ARM == 5 +# define ARCHITECTURE_ID "ARMV5I" +# else +# define ARCHITECTURE_ID "ARMV" STRINGIFY(_M_ARM) +# endif + +# elif defined(_M_MIPS) +# define ARCHITECTURE_ID "MIPS" + +# elif defined(_M_SH) +# define ARCHITECTURE_ID "SHx" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__WATCOMC__) +# if defined(_M_I86) +# define ARCHITECTURE_ID "I86" + +# elif defined(_M_IX86) +# define ARCHITECTURE_ID "X86" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC) +# if defined(__ICCARM__) +# define ARCHITECTURE_ID "ARM" + +# elif defined(__ICCRX__) +# define ARCHITECTURE_ID "RX" + +# elif defined(__ICCRH850__) +# define ARCHITECTURE_ID "RH850" + +# elif defined(__ICCRL78__) +# define ARCHITECTURE_ID "RL78" + +# elif defined(__ICCRISCV__) +# define ARCHITECTURE_ID "RISCV" + +# elif defined(__ICCAVR__) +# define ARCHITECTURE_ID "AVR" + +# elif defined(__ICC430__) +# define ARCHITECTURE_ID "MSP430" + +# elif defined(__ICCV850__) +# define ARCHITECTURE_ID "V850" + +# elif defined(__ICC8051__) +# define ARCHITECTURE_ID "8051" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif + +#elif defined(__ghs__) +# if defined(__PPC64__) +# define ARCHITECTURE_ID "PPC64" + +# elif defined(__ppc__) +# define ARCHITECTURE_ID "PPC" + +# elif defined(__ARM__) +# define ARCHITECTURE_ID "ARM" + +# elif defined(__x86_64__) +# define ARCHITECTURE_ID "x64" + +# elif defined(__i386__) +# define ARCHITECTURE_ID "X86" + +# else /* unknown architecture */ +# define ARCHITECTURE_ID "" +# endif +#else +# define ARCHITECTURE_ID +#endif + +/* Convert integer to decimal digit literals. */ +#define DEC(n) \ + ('0' + (((n) / 10000000)%10)), \ + ('0' + (((n) / 1000000)%10)), \ + ('0' + (((n) / 100000)%10)), \ + ('0' + (((n) / 10000)%10)), \ + ('0' + (((n) / 1000)%10)), \ + ('0' + (((n) / 100)%10)), \ + ('0' + (((n) / 10)%10)), \ + ('0' + ((n) % 10)) + +/* Convert integer to hex digit literals. */ +#define HEX(n) \ + ('0' + ((n)>>28 & 0xF)), \ + ('0' + ((n)>>24 & 0xF)), \ + ('0' + ((n)>>20 & 0xF)), \ + ('0' + ((n)>>16 & 0xF)), \ + ('0' + ((n)>>12 & 0xF)), \ + ('0' + ((n)>>8 & 0xF)), \ + ('0' + ((n)>>4 & 0xF)), \ + ('0' + ((n) & 0xF)) + +/* Construct a string literal encoding the version number components. */ +#ifdef COMPILER_VERSION_MAJOR +char const info_version[] = { + 'I', 'N', 'F', 'O', ':', + 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','[', + COMPILER_VERSION_MAJOR, +# ifdef COMPILER_VERSION_MINOR + '.', COMPILER_VERSION_MINOR, +# ifdef COMPILER_VERSION_PATCH + '.', COMPILER_VERSION_PATCH, +# ifdef COMPILER_VERSION_TWEAK + '.', COMPILER_VERSION_TWEAK, +# endif +# endif +# endif + ']','\0'}; +#endif + +/* Construct a string literal encoding the internal version number. */ +#ifdef COMPILER_VERSION_INTERNAL +char const info_version_internal[] = { + 'I', 'N', 'F', 'O', ':', + 'c','o','m','p','i','l','e','r','_','v','e','r','s','i','o','n','_', + 'i','n','t','e','r','n','a','l','[', + COMPILER_VERSION_INTERNAL,']','\0'}; +#endif + +/* Construct a string literal encoding the version number components. */ +#ifdef SIMULATE_VERSION_MAJOR +char const info_simulate_version[] = { + 'I', 'N', 'F', 'O', ':', + 's','i','m','u','l','a','t','e','_','v','e','r','s','i','o','n','[', + SIMULATE_VERSION_MAJOR, +# ifdef SIMULATE_VERSION_MINOR + '.', SIMULATE_VERSION_MINOR, +# ifdef SIMULATE_VERSION_PATCH + '.', SIMULATE_VERSION_PATCH, +# ifdef SIMULATE_VERSION_TWEAK + '.', SIMULATE_VERSION_TWEAK, +# endif +# endif +# endif + ']','\0'}; +#endif + +/* Construct the string literal in pieces to prevent the source from + getting matched. Store it in a pointer rather than an array + because some compilers will just produce instructions to fill the + array rather than assigning a pointer to a static array. */ +char const* info_platform = "INFO" ":" "platform[" PLATFORM_ID "]"; +char const* info_arch = "INFO" ":" "arch[" ARCHITECTURE_ID "]"; + + + + +#if defined(__INTEL_COMPILER) && defined(_MSVC_LANG) && _MSVC_LANG < 201403L +# if defined(__INTEL_CXX11_MODE__) +# if defined(__cpp_aggregate_nsdmi) +# define CXX_STD 201402L +# else +# define CXX_STD 201103L +# endif +# else +# define CXX_STD 199711L +# endif +#elif defined(_MSC_VER) && defined(_MSVC_LANG) +# define CXX_STD _MSVC_LANG +#else +# define CXX_STD __cplusplus +#endif + +const char* info_language_dialect_default = "INFO" ":" "dialect_default[" +#if CXX_STD > 201703L + "20" +#elif CXX_STD >= 201703L + "17" +#elif CXX_STD >= 201402L + "14" +#elif CXX_STD >= 201103L + "11" +#else + "98" +#endif +"]"; + +/*--------------------------------------------------------------------------*/ + +int main(int argc, char* argv[]) +{ + int require = 0; + require += info_compiler[argc]; + require += info_platform[argc]; +#ifdef COMPILER_VERSION_MAJOR + require += info_version[argc]; +#endif +#ifdef COMPILER_VERSION_INTERNAL + require += info_version_internal[argc]; +#endif +#ifdef SIMULATE_ID + require += info_simulate[argc]; +#endif +#ifdef SIMULATE_VERSION_MAJOR + require += info_simulate_version[argc]; +#endif +#if defined(__CRAYXE) || defined(__CRAYXC) + require += info_cray[argc]; +#endif + require += info_language_dialect_default[argc]; + (void)argv; + return require; +} diff --git a/CMakeFiles/3.17.0/CompilerIdCXX/a.out b/CMakeFiles/3.17.0/CompilerIdCXX/a.out new file mode 100755 index 0000000..fcabd4e Binary files /dev/null and b/CMakeFiles/3.17.0/CompilerIdCXX/a.out differ diff --git a/CMakeFiles/7DRL.dir/CXX.includecache b/CMakeFiles/7DRL.dir/CXX.includecache index dbf5874..2357f56 100644 --- a/CMakeFiles/7DRL.dir/CXX.includecache +++ b/CMakeFiles/7DRL.dir/CXX.includecache @@ -32,6 +32,10 @@ string unordered_map - +/home/tatjam/code/u101/src/Popup.h +Drawing.h +/home/tatjam/code/u101/src/Drawing.h + /home/tatjam/code/u101/src/Speech.h string - @@ -52,6 +56,20 @@ libtcod.hpp ../defines.h /home/tatjam/code/u101/src/defines.h +/home/tatjam/code/u101/src/disembark/EmbarkScene.h +BuildingMap.h +/home/tatjam/code/u101/src/disembark/BuildingMap.h +../Crewmember.h +/home/tatjam/code/u101/src/Crewmember.h + +/home/tatjam/code/u101/src/flight/FlightMap.cpp +FlightMap.h +/home/tatjam/code/u101/src/flight/FlightMap.h +entity/Buildings.h +/home/tatjam/code/u101/src/flight/entity/Buildings.h +entity/Monsters.h +/home/tatjam/code/u101/src/flight/entity/Monsters.h + /home/tatjam/code/u101/src/flight/FlightMap.h vector - @@ -60,12 +78,6 @@ libtcod.h entity/FlightEntity.h /home/tatjam/code/u101/src/flight/entity/FlightEntity.h -/home/tatjam/code/u101/src/flight/FlightScene.cpp -FlightScene.h -/home/tatjam/code/u101/src/flight/FlightScene.h -entity/Buildings.h -/home/tatjam/code/u101/src/flight/entity/Buildings.h - /home/tatjam/code/u101/src/flight/FlightScene.h libtcod.h - @@ -86,6 +98,22 @@ soloud_wav.h ../vehicle/Vehicle.h /home/tatjam/code/u101/src/vehicle/Vehicle.h +/home/tatjam/code/u101/src/flight/Gamemaster.cpp +Gamemaster.h +/home/tatjam/code/u101/src/flight/Gamemaster.h +FlightScene.h +/home/tatjam/code/u101/src/flight/FlightScene.h +../disembark/EmbarkScene.h +/home/tatjam/code/u101/src/disembark/EmbarkScene.h +entity/Buildings.h +/home/tatjam/code/u101/src/flight/entity/Buildings.h + +/home/tatjam/code/u101/src/flight/Gamemaster.h +../vehicle/Vehicle.h +/home/tatjam/code/u101/src/vehicle/Vehicle.h +../Popup.h +/home/tatjam/code/u101/src/Popup.h + /home/tatjam/code/u101/src/flight/entity/Buildings.h FlightEntity.h /home/tatjam/code/u101/src/flight/entity/FlightEntity.h @@ -98,6 +126,12 @@ FlightEntity.h tuple - +/home/tatjam/code/u101/src/flight/entity/Monsters.h +FlightEntity.h +/home/tatjam/code/u101/src/flight/entity/FlightEntity.h +soloud_wav.h +- + /home/tatjam/code/u101/src/vehicle/FlightCrew.h libtcod.h /home/tatjam/code/u101/src/vehicle/libtcod.h diff --git a/CMakeFiles/7DRL.dir/build.make b/CMakeFiles/7DRL.dir/build.make index b183d70..087862f 100644 --- a/CMakeFiles/7DRL.dir/build.make +++ b/CMakeFiles/7DRL.dir/build.make @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.16 +# Generated by "Unix Makefiles" Generator, CMake Version 3.17 # Delete rule output on recipe failure. .DELETE_ON_ERROR: @@ -12,8 +12,25 @@ .SUFFIXES: -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = +# Disable VCS-based implicit rules. +% : %,v + + +# Disable VCS-based implicit rules. +% : RCS/% + + +# Disable VCS-based implicit rules. +% : RCS/%,v + + +# Disable VCS-based implicit rules. +% : SCCS/s.% + + +# Disable VCS-based implicit rules. +% : s.% + .SUFFIXES: .hpux_make_needs_suffix_list @@ -37,7 +54,7 @@ SHELL = /bin/sh CMAKE_COMMAND = /usr/bin/cmake # The command to remove a file. -RM = /usr/bin/cmake -E remove -f +RM = /usr/bin/cmake -E rm -f # Escaping for special characters. EQUALS = = diff --git a/CMakeFiles/7DRL.dir/depend.internal b/CMakeFiles/7DRL.dir/depend.internal index 93b2144..2e3072c 100644 --- a/CMakeFiles/7DRL.dir/depend.internal +++ b/CMakeFiles/7DRL.dir/depend.internal @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.16 +# Generated by "Unix Makefiles" Generator, CMake Version 3.17 CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt_dll.c.o /home/tatjam/code/u101/src/soloud/src/audiosource/openmpt/soloud_openmpt_dll.c diff --git a/CMakeFiles/7DRL.dir/depend.make b/CMakeFiles/7DRL.dir/depend.make index 9e66b8b..a0cde56 100644 --- a/CMakeFiles/7DRL.dir/depend.make +++ b/CMakeFiles/7DRL.dir/depend.make @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.16 +# Generated by "Unix Makefiles" Generator, CMake Version 3.17 CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt_dll.c.o: src/soloud/src/audiosource/openmpt/soloud_openmpt_dll.c diff --git a/CMakeFiles/7DRL.dir/flags.make b/CMakeFiles/7DRL.dir/flags.make index 7f18c86..0b52fcf 100644 --- a/CMakeFiles/7DRL.dir/flags.make +++ b/CMakeFiles/7DRL.dir/flags.make @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.16 +# Generated by "Unix Makefiles" Generator, CMake Version 3.17 # compile C with /usr/bin/cc # compile CXX with /usr/bin/c++ diff --git a/CMakeFiles/7DRL.dir/src/Crewmember.cpp.o b/CMakeFiles/7DRL.dir/src/Crewmember.cpp.o index d637372..0126e8f 100644 Binary files a/CMakeFiles/7DRL.dir/src/Crewmember.cpp.o and b/CMakeFiles/7DRL.dir/src/Crewmember.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/Main.cpp.o b/CMakeFiles/7DRL.dir/src/Main.cpp.o index 09355a1..7e7c304 100644 Binary files a/CMakeFiles/7DRL.dir/src/Main.cpp.o and b/CMakeFiles/7DRL.dir/src/Main.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/Status.cpp.o b/CMakeFiles/7DRL.dir/src/Status.cpp.o index 365a38d..116c099 100644 Binary files a/CMakeFiles/7DRL.dir/src/Status.cpp.o and b/CMakeFiles/7DRL.dir/src/Status.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/disembark/BuildingMap.cpp.o b/CMakeFiles/7DRL.dir/src/disembark/BuildingMap.cpp.o index 010876e..2dd4bb9 100644 Binary files a/CMakeFiles/7DRL.dir/src/disembark/BuildingMap.cpp.o and b/CMakeFiles/7DRL.dir/src/disembark/BuildingMap.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/disembark/EmbarkScene.cpp.o b/CMakeFiles/7DRL.dir/src/disembark/EmbarkScene.cpp.o index 2d549dd..f2d524f 100644 Binary files a/CMakeFiles/7DRL.dir/src/disembark/EmbarkScene.cpp.o and b/CMakeFiles/7DRL.dir/src/disembark/EmbarkScene.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/flight/FlightMap.cpp.o b/CMakeFiles/7DRL.dir/src/flight/FlightMap.cpp.o index 202ccc9..4071d45 100644 Binary files a/CMakeFiles/7DRL.dir/src/flight/FlightMap.cpp.o and b/CMakeFiles/7DRL.dir/src/flight/FlightMap.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/flight/FlightScene.cpp.o b/CMakeFiles/7DRL.dir/src/flight/FlightScene.cpp.o index 0a57905..caa9610 100644 Binary files a/CMakeFiles/7DRL.dir/src/flight/FlightScene.cpp.o and b/CMakeFiles/7DRL.dir/src/flight/FlightScene.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/flight/Gamemaster.cpp.o b/CMakeFiles/7DRL.dir/src/flight/Gamemaster.cpp.o index 20223f0..5d11bf0 100644 Binary files a/CMakeFiles/7DRL.dir/src/flight/Gamemaster.cpp.o and b/CMakeFiles/7DRL.dir/src/flight/Gamemaster.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/flight/entity/Buildings.cpp.o b/CMakeFiles/7DRL.dir/src/flight/entity/Buildings.cpp.o index 46b4e22..c9ebf06 100644 Binary files a/CMakeFiles/7DRL.dir/src/flight/entity/Buildings.cpp.o and b/CMakeFiles/7DRL.dir/src/flight/entity/Buildings.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/flight/entity/EntityTorpedo.cpp.o b/CMakeFiles/7DRL.dir/src/flight/entity/EntityTorpedo.cpp.o index 8ccd37f..649bc74 100644 Binary files a/CMakeFiles/7DRL.dir/src/flight/entity/EntityTorpedo.cpp.o and b/CMakeFiles/7DRL.dir/src/flight/entity/EntityTorpedo.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/flight/entity/Monsters.cpp.o b/CMakeFiles/7DRL.dir/src/flight/entity/Monsters.cpp.o index aea34da..e5f1a8f 100644 Binary files a/CMakeFiles/7DRL.dir/src/flight/entity/Monsters.cpp.o and b/CMakeFiles/7DRL.dir/src/flight/entity/Monsters.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/monotone/soloud_monotone.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/monotone/soloud_monotone.cpp.o index dae1654..be74de5 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/monotone/soloud_monotone.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/monotone/soloud_monotone.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt.cpp.o index 066b738..5379342 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt_dll.c.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt_dll.c.o index fe96efc..eb6280d 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt_dll.c.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/openmpt/soloud_openmpt_dll.c.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/sfxr/soloud_sfxr.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/sfxr/soloud_sfxr.cpp.o index 504b0fe..a51de1b 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/sfxr/soloud_sfxr.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/sfxr/soloud_sfxr.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/darray.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/darray.cpp.o index ce10373..5d4f6fb 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/darray.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/darray.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/klatt.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/klatt.cpp.o index 94ecf04..b6de9e8 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/klatt.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/klatt.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/resonator.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/resonator.cpp.o index dec907b..4aec092 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/resonator.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/resonator.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/soloud_speech.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/soloud_speech.cpp.o index 8fe510c..8361725 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/soloud_speech.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/soloud_speech.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/tts.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/tts.cpp.o index 9d1e656..617ab93 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/tts.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/speech/tts.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/sid.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/sid.cpp.o index 14bda9f..61183a0 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/sid.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/sid.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/soloud_tedsid.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/soloud_tedsid.cpp.o index 5956731..5e65bb1 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/soloud_tedsid.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/soloud_tedsid.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/ted.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/ted.cpp.o index b20e6b4..d160165 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/ted.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/tedsid/ted.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/vic/soloud_vic.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/vic/soloud_vic.cpp.o index 2f9cfa2..9246a9a 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/vic/soloud_vic.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/vic/soloud_vic.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/vizsn/soloud_vizsn.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/vizsn/soloud_vizsn.cpp.o index 43e51c6..2a4968f 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/vizsn/soloud_vizsn.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/vizsn/soloud_vizsn.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/dr_impl.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/dr_impl.cpp.o index 83010b5..4b97d03 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/dr_impl.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/dr_impl.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/soloud_wav.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/soloud_wav.cpp.o index ba179d2..4119c55 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/soloud_wav.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/soloud_wav.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/soloud_wavstream.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/soloud_wavstream.cpp.o index 7830c7f..fd6c0a4 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/soloud_wavstream.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/soloud_wavstream.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/stb_vorbis.c.o b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/stb_vorbis.c.o index ade4830..959d6b8 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/stb_vorbis.c.o and b/CMakeFiles/7DRL.dir/src/soloud/src/audiosource/wav/stb_vorbis.c.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/backend/alsa/soloud_alsa.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/backend/alsa/soloud_alsa.cpp.o index 86464ce..28072f6 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/backend/alsa/soloud_alsa.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/backend/alsa/soloud_alsa.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl1.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl1.cpp.o index deffbd9..2c6d109 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl1.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl1.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl1_dll.c.o b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl1_dll.c.o index c8ed7fb..03e3dd8 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl1_dll.c.o and b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl1_dll.c.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl2.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl2.cpp.o index 443de0a..3dca66e 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl2.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl2.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl2_dll.c.o b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl2_dll.c.o index f75a6e8..bb3316e 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl2_dll.c.o and b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl/soloud_sdl2_dll.c.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl2_static/soloud_sdl2_static.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl2_static/soloud_sdl2_static.cpp.o index ce83f17..c92a3ee 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl2_static/soloud_sdl2_static.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl2_static/soloud_sdl2_static.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl_static/soloud_sdl_static.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl_static/soloud_sdl_static.cpp.o index fea99ab..686f94f 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl_static/soloud_sdl_static.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/backend/sdl_static/soloud_sdl_static.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/c_api/soloud_c.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/c_api/soloud_c.cpp.o index 0117175..99d93b7 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/c_api/soloud_c.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/c_api/soloud_c.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud.cpp.o index 8003df6..1470054 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_audiosource.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_audiosource.cpp.o index 8651bf3..6c13ae0 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_audiosource.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_audiosource.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_bus.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_bus.cpp.o index 3af71d4..7e21195 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_bus.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_bus.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_3d.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_3d.cpp.o index 7e0512e..cca05ee 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_3d.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_3d.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_basicops.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_basicops.cpp.o index d4dd869..93c46fa 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_basicops.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_basicops.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_faderops.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_faderops.cpp.o index a49ae69..7b126ae 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_faderops.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_faderops.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_filterops.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_filterops.cpp.o index be05920..6cfb43d 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_filterops.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_filterops.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_getters.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_getters.cpp.o index 62d7c97..5f05075 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_getters.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_getters.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_setters.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_setters.cpp.o index 835680c..df57124 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_setters.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_setters.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_voicegroup.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_voicegroup.cpp.o index cd274b4..e08e2cd 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_voicegroup.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_voicegroup.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_voiceops.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_voiceops.cpp.o index 99de54f..6288de1 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_voiceops.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_core_voiceops.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fader.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fader.cpp.o index 64f3e9a..d59bf51 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fader.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fader.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fft.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fft.cpp.o index 1a880a9..17ad1bc 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fft.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fft.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fft_lut.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fft_lut.cpp.o index 95de350..24698d8 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fft_lut.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_fft_lut.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_file.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_file.cpp.o index d13525a..066894c 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_file.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_file.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_filter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_filter.cpp.o index 9802f0d..3c9a461 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_filter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_filter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_queue.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_queue.cpp.o index 9f1fd67..444b673 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_queue.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_queue.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_thread.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_thread.cpp.o index 1f4fa6f..1878ef8 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_thread.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/core/soloud_thread.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_bassboostfilter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_bassboostfilter.cpp.o index dc85497..d9782a3 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_bassboostfilter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_bassboostfilter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_biquadresonantfilter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_biquadresonantfilter.cpp.o index c24bcac..e8c77c3 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_biquadresonantfilter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_biquadresonantfilter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_dcremovalfilter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_dcremovalfilter.cpp.o index 5d529cd..7ea8384 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_dcremovalfilter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_dcremovalfilter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_echofilter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_echofilter.cpp.o index e564046..5f4d79c 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_echofilter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_echofilter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_fftfilter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_fftfilter.cpp.o index 5a260aa..35def0f 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_fftfilter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_fftfilter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_flangerfilter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_flangerfilter.cpp.o index d334daf..8cbf649 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_flangerfilter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_flangerfilter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_lofifilter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_lofifilter.cpp.o index f16da63..b5b77a7 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_lofifilter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_lofifilter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_robotizefilter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_robotizefilter.cpp.o index 586cb11..c6b0a55 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_robotizefilter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_robotizefilter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_waveshaperfilter.cpp.o b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_waveshaperfilter.cpp.o index 43f2a25..3dafe22 100644 Binary files a/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_waveshaperfilter.cpp.o and b/CMakeFiles/7DRL.dir/src/soloud/src/filter/soloud_waveshaperfilter.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/vehicle/FlightCrew.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/FlightCrew.cpp.o index 00b87ef..d2b34b2 100644 Binary files a/CMakeFiles/7DRL.dir/src/vehicle/FlightCrew.cpp.o and b/CMakeFiles/7DRL.dir/src/vehicle/FlightCrew.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/vehicle/Vehicle.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/Vehicle.cpp.o index 383adfb..396ace1 100644 Binary files a/CMakeFiles/7DRL.dir/src/vehicle/Vehicle.cpp.o and b/CMakeFiles/7DRL.dir/src/vehicle/Vehicle.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Battery.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Battery.cpp.o index b15a879..59514d7 100644 Binary files a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Battery.cpp.o and b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Battery.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Machines.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Machines.cpp.o index 3ce4254..a89ee08 100644 Binary files a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Machines.cpp.o and b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Machines.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Maneouver.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Maneouver.cpp.o index 5287ac0..73bfb38 100644 Binary files a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Maneouver.cpp.o and b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Maneouver.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Periscope.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Periscope.cpp.o index 0c84120..17c4794 100644 Binary files a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Periscope.cpp.o and b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Periscope.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Radio.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Radio.cpp.o index 47a1db5..1c0a014 100644 Binary files a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Radio.cpp.o and b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Radio.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Sonar.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Sonar.cpp.o index c0aad1c..43acc68 100644 Binary files a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Sonar.cpp.o and b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Sonar.cpp.o differ diff --git a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Targeting.cpp.o b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Targeting.cpp.o index 0b23aad..5729f6f 100644 Binary files a/CMakeFiles/7DRL.dir/src/vehicle/workbench/Targeting.cpp.o and b/CMakeFiles/7DRL.dir/src/vehicle/workbench/Targeting.cpp.o differ diff --git a/CMakeFiles/CMakeDirectoryInformation.cmake b/CMakeFiles/CMakeDirectoryInformation.cmake index 42bfccc..2fbee64 100644 --- a/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/CMakeFiles/CMakeDirectoryInformation.cmake @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.16 +# Generated by "Unix Makefiles" Generator, CMake Version 3.17 # Relative path conversion top directories. set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/tatjam/code/u101") diff --git a/CMakeFiles/Makefile.cmake b/CMakeFiles/Makefile.cmake index 7d0acca..1e49a37 100644 --- a/CMakeFiles/Makefile.cmake +++ b/CMakeFiles/Makefile.cmake @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.16 +# Generated by "Unix Makefiles" Generator, CMake Version 3.17 # The generator used is: set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles") @@ -7,105 +7,40 @@ set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles") # The top level Makefile was generated from the following files: set(CMAKE_MAKEFILE_DEPENDS "CMakeCache.txt" - "CMakeFiles/3.16.5/CMakeCCompiler.cmake" - "CMakeFiles/3.16.5/CMakeCXXCompiler.cmake" - "CMakeFiles/3.16.5/CMakeSystem.cmake" + "CMakeFiles/3.17.0/CMakeCCompiler.cmake" + "CMakeFiles/3.17.0/CMakeCXXCompiler.cmake" + "CMakeFiles/3.17.0/CMakeSystem.cmake" "CMakeLists.txt" "/usr/lib64/cmake/SDL2/SDL2Config.cmake" "/usr/lib64/cmake/SDL2/SDL2ConfigVersion.cmake" "/usr/lib64/cmake/SDL2/SDL2Targets-noconfig.cmake" "/usr/lib64/cmake/SDL2/SDL2Targets.cmake" - "/usr/share/cmake-3.16/Modules/CMakeCCompiler.cmake.in" - "/usr/share/cmake-3.16/Modules/CMakeCCompilerABI.c" - "/usr/share/cmake-3.16/Modules/CMakeCInformation.cmake" - "/usr/share/cmake-3.16/Modules/CMakeCXXCompiler.cmake.in" - "/usr/share/cmake-3.16/Modules/CMakeCXXCompilerABI.cpp" - "/usr/share/cmake-3.16/Modules/CMakeCXXInformation.cmake" - "/usr/share/cmake-3.16/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake" - "/usr/share/cmake-3.16/Modules/CMakeCommonLanguageInclude.cmake" - "/usr/share/cmake-3.16/Modules/CMakeCompilerIdDetection.cmake" - "/usr/share/cmake-3.16/Modules/CMakeDetermineCCompiler.cmake" - "/usr/share/cmake-3.16/Modules/CMakeDetermineCXXCompiler.cmake" - "/usr/share/cmake-3.16/Modules/CMakeDetermineCompileFeatures.cmake" - "/usr/share/cmake-3.16/Modules/CMakeDetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/CMakeDetermineCompilerABI.cmake" - "/usr/share/cmake-3.16/Modules/CMakeDetermineCompilerId.cmake" - "/usr/share/cmake-3.16/Modules/CMakeDetermineSystem.cmake" - "/usr/share/cmake-3.16/Modules/CMakeFindBinUtils.cmake" - "/usr/share/cmake-3.16/Modules/CMakeGenericSystem.cmake" - "/usr/share/cmake-3.16/Modules/CMakeInitializeConfigs.cmake" - "/usr/share/cmake-3.16/Modules/CMakeLanguageInformation.cmake" - "/usr/share/cmake-3.16/Modules/CMakeParseImplicitIncludeInfo.cmake" - "/usr/share/cmake-3.16/Modules/CMakeParseImplicitLinkInfo.cmake" - "/usr/share/cmake-3.16/Modules/CMakeSystem.cmake.in" - "/usr/share/cmake-3.16/Modules/CMakeSystemSpecificInformation.cmake" - "/usr/share/cmake-3.16/Modules/CMakeSystemSpecificInitialize.cmake" - "/usr/share/cmake-3.16/Modules/CMakeTestCCompiler.cmake" - "/usr/share/cmake-3.16/Modules/CMakeTestCXXCompiler.cmake" - "/usr/share/cmake-3.16/Modules/CMakeTestCompilerCommon.cmake" - "/usr/share/cmake-3.16/Modules/CheckCSourceCompiles.cmake" - "/usr/share/cmake-3.16/Modules/CheckIncludeFile.cmake" - "/usr/share/cmake-3.16/Modules/CheckLibraryExists.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/ADSP-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/ARMCC-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/ARMClang-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/AppleClang-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Borland-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Bruce-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/CMakeCommonCompilerMacros.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Clang-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Clang-DetermineCompilerInternal.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Compaq-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Cray-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Embarcadero-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Fujitsu-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/GHS-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/GNU-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/GNU-C.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/GNU-CXX.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/GNU-FindBinUtils.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/GNU.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/HP-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/HP-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/IAR-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Intel-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/MSVC-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/NVIDIA-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/PGI-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/PathScale-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/SCO-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/SDCC-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/SunPro-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/TI-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/Watcom-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/XL-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/XL-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/XLClang-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/zOS-C-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake" - "/usr/share/cmake-3.16/Modules/FindALSA.cmake" - "/usr/share/cmake-3.16/Modules/FindPackageHandleStandardArgs.cmake" - "/usr/share/cmake-3.16/Modules/FindPackageMessage.cmake" - "/usr/share/cmake-3.16/Modules/FindThreads.cmake" - "/usr/share/cmake-3.16/Modules/Internal/CMakeCheckCompilerFlag.cmake" - "/usr/share/cmake-3.16/Modules/Internal/FeatureTesting.cmake" - "/usr/share/cmake-3.16/Modules/Platform/Linux-Determine-CXX.cmake" - "/usr/share/cmake-3.16/Modules/Platform/Linux-GNU-C.cmake" - "/usr/share/cmake-3.16/Modules/Platform/Linux-GNU-CXX.cmake" - "/usr/share/cmake-3.16/Modules/Platform/Linux-GNU.cmake" - "/usr/share/cmake-3.16/Modules/Platform/Linux.cmake" - "/usr/share/cmake-3.16/Modules/Platform/UnixPaths.cmake" + "/usr/share/cmake-3.17/Modules/CMakeCInformation.cmake" + "/usr/share/cmake-3.17/Modules/CMakeCXXInformation.cmake" + "/usr/share/cmake-3.17/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake" + "/usr/share/cmake-3.17/Modules/CMakeCommonLanguageInclude.cmake" + "/usr/share/cmake-3.17/Modules/CMakeGenericSystem.cmake" + "/usr/share/cmake-3.17/Modules/CMakeInitializeConfigs.cmake" + "/usr/share/cmake-3.17/Modules/CMakeLanguageInformation.cmake" + "/usr/share/cmake-3.17/Modules/CMakeSystemSpecificInformation.cmake" + "/usr/share/cmake-3.17/Modules/CMakeSystemSpecificInitialize.cmake" + "/usr/share/cmake-3.17/Modules/CheckCSourceCompiles.cmake" + "/usr/share/cmake-3.17/Modules/CheckIncludeFile.cmake" + "/usr/share/cmake-3.17/Modules/CheckLibraryExists.cmake" + "/usr/share/cmake-3.17/Modules/Compiler/CMakeCommonCompilerMacros.cmake" + "/usr/share/cmake-3.17/Modules/Compiler/GNU-C.cmake" + "/usr/share/cmake-3.17/Modules/Compiler/GNU-CXX.cmake" + "/usr/share/cmake-3.17/Modules/Compiler/GNU.cmake" + "/usr/share/cmake-3.17/Modules/FindALSA.cmake" + "/usr/share/cmake-3.17/Modules/FindPackageHandleStandardArgs.cmake" + "/usr/share/cmake-3.17/Modules/FindPackageMessage.cmake" + "/usr/share/cmake-3.17/Modules/FindThreads.cmake" + "/usr/share/cmake-3.17/Modules/Internal/CMakeCheckCompilerFlag.cmake" + "/usr/share/cmake-3.17/Modules/Platform/Linux-GNU-C.cmake" + "/usr/share/cmake-3.17/Modules/Platform/Linux-GNU-CXX.cmake" + "/usr/share/cmake-3.17/Modules/Platform/Linux-GNU.cmake" + "/usr/share/cmake-3.17/Modules/Platform/Linux.cmake" + "/usr/share/cmake-3.17/Modules/Platform/UnixPaths.cmake" ) # The corresponding makefile is: @@ -116,11 +51,6 @@ set(CMAKE_MAKEFILE_OUTPUTS # Byproducts of CMake generate step: set(CMAKE_MAKEFILE_PRODUCTS - "CMakeFiles/3.16.5/CMakeSystem.cmake" - "CMakeFiles/3.16.5/CMakeCCompiler.cmake" - "CMakeFiles/3.16.5/CMakeCXXCompiler.cmake" - "CMakeFiles/3.16.5/CMakeCCompiler.cmake" - "CMakeFiles/3.16.5/CMakeCXXCompiler.cmake" "CMakeFiles/CMakeDirectoryInformation.cmake" ) diff --git a/CMakeFiles/Makefile2 b/CMakeFiles/Makefile2 index 1e396e6..9f72ec7 100644 --- a/CMakeFiles/Makefile2 +++ b/CMakeFiles/Makefile2 @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.16 +# Generated by "Unix Makefiles" Generator, CMake Version 3.17 # Default target executed when no arguments are given to make. default_target: all @@ -13,8 +13,25 @@ default_target: all .SUFFIXES: -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = +# Disable VCS-based implicit rules. +% : %,v + + +# Disable VCS-based implicit rules. +% : RCS/% + + +# Disable VCS-based implicit rules. +% : RCS/%,v + + +# Disable VCS-based implicit rules. +% : SCCS/s.% + + +# Disable VCS-based implicit rules. +% : s.% + .SUFFIXES: .hpux_make_needs_suffix_list @@ -38,7 +55,7 @@ SHELL = /bin/sh CMAKE_COMMAND = /usr/bin/cmake # The command to remove a file. -RM = /usr/bin/cmake -E remove -f +RM = /usr/bin/cmake -E rm -f # Escaping for special characters. EQUALS = = diff --git a/Makefile b/Makefile index 9933801..fd8a9e8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.16 +# Generated by "Unix Makefiles" Generator, CMake Version 3.17 # Default target executed when no arguments are given to make. default_target: all @@ -17,8 +17,25 @@ default_target: all .SUFFIXES: -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = +# Disable VCS-based implicit rules. +% : %,v + + +# Disable VCS-based implicit rules. +% : RCS/% + + +# Disable VCS-based implicit rules. +% : RCS/%,v + + +# Disable VCS-based implicit rules. +% : SCCS/s.% + + +# Disable VCS-based implicit rules. +% : s.% + .SUFFIXES: .hpux_make_needs_suffix_list @@ -42,7 +59,7 @@ SHELL = /bin/sh CMAKE_COMMAND = /usr/bin/cmake # The command to remove a file. -RM = /usr/bin/cmake -E remove -f +RM = /usr/bin/cmake -E rm -f # Escaping for special characters. EQUALS = = @@ -59,7 +76,7 @@ CMAKE_BINARY_DIR = /home/tatjam/code/u101 # Special rule for the target rebuild_cache rebuild_cache: @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - /usr/bin/cmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) + /usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) .PHONY : rebuild_cache # Special rule for the target rebuild_cache @@ -2100,9 +2117,9 @@ help: @echo "... all (the default if no target is provided)" @echo "... clean" @echo "... depend" + @echo "... edit_cache" @echo "... rebuild_cache" @echo "... 7DRL" - @echo "... edit_cache" @echo "... src/Crewmember.o" @echo "... src/Crewmember.i" @echo "... src/Crewmember.s" diff --git a/src/flight/FlightMap.cpp b/src/flight/FlightMap.cpp index 899ff84..1284b7d 100755 --- a/src/flight/FlightMap.cpp +++ b/src/flight/FlightMap.cpp @@ -240,7 +240,7 @@ FlightMap::FlightMap(int width, int height, size_t seed, FlightScene* scene) : v int stations = 0; - while (stations < 3) + while (stations < 40) { // Place stations far away from the center int x = g_random->getInt(0, width - 1); @@ -251,7 +251,7 @@ FlightMap::FlightMap(int width, int height, size_t seed, FlightScene* scene) : v float dist = sqrt(xf * xf + yf * yf); - if (dist >= 0.7f && tiles[y * width + x] != WALL) + if (dist >= 0.7f && tiles[y * width + x] != WALL) { tiles[y * width + x] = STATION; stations++; @@ -259,6 +259,7 @@ FlightMap::FlightMap(int width, int height, size_t seed, FlightScene* scene) : v n->set_position((float)x + 0.5f, (float)y + 0.5f); n->init(this, scene); entities.push_back(n); + //printf("Put station at: %i, %i\n", x, y); } } diff --git a/src/flight/Gamemaster.cpp b/src/flight/Gamemaster.cpp index 2a7c7f1..97cea2b 100755 --- a/src/flight/Gamemaster.cpp +++ b/src/flight/Gamemaster.cpp @@ -35,7 +35,7 @@ void Gamemaster::update(float dt) { coords += std::to_string((int)floor(ent->get_x())); coords += ", "; - coords += std::to_string((int)floor(ent->get_x())); + coords += std::to_string((int)floor(ent->get_y())); break; } } diff --git a/7DRL.zip b/u101.tar.gz similarity index 75% rename from 7DRL.zip rename to u101.tar.gz index d583fda..ed4df7b 100644 Binary files a/7DRL.zip and b/u101.tar.gz differ