diff --git a/CMake/CMakeMacros.cmake b/CMake/CMakeMacros.cmake index 5049e4fbc7..7e85ddd870 100644 --- a/CMake/CMakeMacros.cmake +++ b/CMake/CMakeMacros.cmake @@ -55,3 +55,4 @@ function(disable_project_warnings projectName) endif() endif() endfunction() + diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake index a982526613..2a9109f523 100644 --- a/StepmaniaCore.cmake +++ b/StepmaniaCore.cmake @@ -56,36 +56,31 @@ check_include_files(stdint.h HAVE_STDINT_H) check_include_files(endian.h HAVE_ENDIAN_H) check_include_files(sys/endian.h HAVE_SYS_ENDIAN_H) check_include_files(machine/endian.h HAVE_MACHINE_ENDIAN_H) -check_include_files(sys/param.h HAS_SYS_PARAM_H) -check_include_files(sys/utsname.h HAS_SYS_UTSNAME_H) +check_include_files(sys/param.h HAVE_SYS_PARAM_H) +check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H) check_include_files(fcntl.h HAVE_FCNTL_H) check_include_files(unistd.h HAVE_UNISTD_H) include(CheckFunctionExists) include(CheckSymbolExists) +include(CheckCXXSymbolExists) if (WIN32 AND MSVC) check_function_exists(_mkdir HAVE__MKDIR) check_function_exists(_snprintf HAVE__SNPRINTF) - check_symbol_exists(powf math.h HAVE_POWF) - check_symbol_exists(sqrtf math.h HAVE_SQRTF) - check_symbol_exists(sinf math.h HAVE_SINF) - check_symbol_exists(tanf math.h HAVE_TANF) - check_symbol_exists(cosf math.h HAVE_COSF) - check_symbol_exists(acosf math.h HAVE_ACOSF) else() check_function_exists(mkdir HAVE_MKDIR) check_function_exists(snprintf HAVE_SNPRINTF) - check_function_exists(powf HAVE_POWF) - check_function_exists(sqrtf HAVE_SQRTF) - check_function_exists(sinf HAVE_SINF) - check_function_exists(tanf HAVE_TANF) - check_function_exists(cosf HAVE_COSF) - check_function_exists(acosf HAVE_ACOSF) endif() -check_function_exists(truncf HAVE_TRUNCF) -check_function_exists(roundf HAVE_ROUNDF) -check_function_exists(lrintf HAVE_LRINTF) -check_function_exists(strtof HAVE_STRTOF) +check_cxx_symbol_exists(powf cmath HAVE_POWF) +check_cxx_symbol_exists(sqrtf cmath HAVE_SQRTF) +check_cxx_symbol_exists(sinf cmath HAVE_SINF) +check_cxx_symbol_exists(tanf cmath HAVE_TANF) +check_cxx_symbol_exists(cosf cmath HAVE_COSF) +check_cxx_symbol_exists(acosf cmath HAVE_ACOSF) +check_cxx_symbol_exists(truncf cmath HAVE_TRUNCF) +check_cxx_symbol_exists(roundf cmath HAVE_ROUNDF) +check_cxx_symbol_exists(lrintf cmath HAVE_LRINTF) +check_cxx_symbol_exists(strtof cstdlib HAVE_STRTOF) check_symbol_exists(M_PI math.h HAVE_M_PI) # Checks to make it easier to work with 32-bit/64-bit builds if required. diff --git a/src/CMakeData-gtk.cmake b/src/CMakeData-gtk.cmake index 38bd3a80c7..7082744c79 100644 --- a/src/CMakeData-gtk.cmake +++ b/src/CMakeData-gtk.cmake @@ -26,4 +26,7 @@ list(APPEND SM_GTK_INCLUDE_DIRS "${SM_SRC_DIR}/arch/LoadingWindow" "${GTK2_INCLUDE_DIRS}" ) + +sm_add_compile_definition("GtkModule" CMAKE_POWERED) + target_include_directories("GtkModule" PUBLIC ${SM_GTK_INCLUDE_DIRS}) diff --git a/src/RageException.h b/src/RageException.h index 803bcb4c4d..210b8bac49 100644 --- a/src/RageException.h +++ b/src/RageException.h @@ -1,5 +1,10 @@ #ifndef RAGE_EXCEPTION_H #define RAGE_EXCEPTION_H + +#if defined(CMAKE_POWERED) +#include "config.hpp" +#endif + /** * @brief Namespace for throwing fatal errors. *