diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-01-25 04:16:06 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-01-25 04:16:06 +0000 |
| commit | 90ba135c30d63b97fcfbcc088d0dee9ed67a351e (patch) | |
| tree | 17d81eb99a7ddc76ab703f61b5873b34f5e91edd /Utilities/File2Include | |
| parent | Updated MacOSDebug to use NSLog (diff) | |
| download | DiligentCore-90ba135c30d63b97fcfbcc088d0dee9ed67a351e.tar.gz DiligentCore-90ba135c30d63b97fcfbcc088d0dee9ed67a351e.zip | |
Enabled File2String on Mac; updated GLSLDefinitions to disable functions unsupported in GL4.1
Diffstat (limited to 'Utilities/File2Include')
| -rw-r--r-- | Utilities/File2Include/CMakeLists.txt | 12 | ||||
| -rwxr-xr-x | Utilities/File2Include/bin/MacOS/File2String | bin | 0 -> 13060 bytes |
2 files changed, 10 insertions, 2 deletions
diff --git a/Utilities/File2Include/CMakeLists.txt b/Utilities/File2Include/CMakeLists.txt index d6bcf2f1..800be39e 100644 --- a/Utilities/File2Include/CMakeLists.txt +++ b/Utilities/File2Include/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.6) -if(PLATFORM_WIN32 OR PLATFORM_LINUX) +if(PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS) project(File2Include) set(SOURCE @@ -26,6 +26,11 @@ if(PLATFORM_WIN32 OR PLATFORM_LINUX) set_target_properties(File2String PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/bin/Linux" ) + elseif(PLATFORM_MACOS) + set_target_properties(File2String PROPERTIES + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/bin/MacOS" + ) + target_compile_features(File2String PRIVATE cxx_std_11) endif() source_group("source" FILES ${SOURCE}) @@ -38,8 +43,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") # Use prebuilt 32-bit version set(FILE2STRING_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin/Win32/x32/File2String.exe" CACHE INTERNAL "File2String utility") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - # Use prebuilt 32-bit version + # Use prebuilt version set(FILE2STRING_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin/Linux/File2String" CACHE INTERNAL "File2String utility") +elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + # Use prebuilt version + set(FILE2STRING_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin/MacOS/File2String" CACHE INTERNAL "File2String utility") else() set(FILE2STRING_PATH "" CACHE INTERNAL "File2String utility unavailable on this host system") endif() diff --git a/Utilities/File2Include/bin/MacOS/File2String b/Utilities/File2Include/bin/MacOS/File2String Binary files differnew file mode 100755 index 00000000..5865d35e --- /dev/null +++ b/Utilities/File2Include/bin/MacOS/File2String |