From 5907182f951d53b9a1edecca3dffbf25d20fe7c5 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Thu, 29 Apr 2021 06:04:14 +0100 Subject: [PATCH] Renamed cgl_platform.mm -> cgl_platform_helpers.mm Support for Xcode project generation. Distinguish object file between .cpp & .mm versions. Xcode project build did not work when had the same source file with .cpp and .mm extensions ie. cgl_platform.cpp & cgl_platform.mm The makefile generator explicitly distinguishes the targets ie. cgl_platform.cpp.o & cgl_platform.mm.o --- renderdoc/driver/gl/CMakeLists.txt | 2 +- renderdoc/driver/gl/cgl_platform.cpp | 2 +- .../driver/gl/{cgl_platform.mm => cgl_platform_helpers.mm} | 0 renderdoc/driver/gl/renderdoc_gl.vcxproj | 2 +- renderdoc/driver/gl/renderdoc_gl.vcxproj.filters | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename renderdoc/driver/gl/{cgl_platform.mm => cgl_platform_helpers.mm} (100%) diff --git a/renderdoc/driver/gl/CMakeLists.txt b/renderdoc/driver/gl/CMakeLists.txt index 236ec34c1..37e46dca0 100644 --- a/renderdoc/driver/gl/CMakeLists.txt +++ b/renderdoc/driver/gl/CMakeLists.txt @@ -54,7 +54,7 @@ list(APPEND sources gl_hooks.cpp) if(APPLE) list(APPEND sources cgl_dispatch_table.h - cgl_platform.mm + cgl_platform_helpers.mm cgl_platform.cpp cgl_hooks.cpp) else() diff --git a/renderdoc/driver/gl/cgl_platform.cpp b/renderdoc/driver/gl/cgl_platform.cpp index 0ab06ba3e..65c352c0b 100644 --- a/renderdoc/driver/gl/cgl_platform.cpp +++ b/renderdoc/driver/gl/cgl_platform.cpp @@ -29,7 +29,7 @@ #include "apple_gl_hook_defs.h" -// helpers defined in cgl_platform.mm +// helpers defined in cgl_platform_helpers.mm void Apple_getWindowSize(void *view, int &width, int &height); void Apple_stopTrackingWindowSize(void *view); void NSGL_init(); diff --git a/renderdoc/driver/gl/cgl_platform.mm b/renderdoc/driver/gl/cgl_platform_helpers.mm similarity index 100% rename from renderdoc/driver/gl/cgl_platform.mm rename to renderdoc/driver/gl/cgl_platform_helpers.mm diff --git a/renderdoc/driver/gl/renderdoc_gl.vcxproj b/renderdoc/driver/gl/renderdoc_gl.vcxproj index d1f727370..2e56ff758 100644 --- a/renderdoc/driver/gl/renderdoc_gl.vcxproj +++ b/renderdoc/driver/gl/renderdoc_gl.vcxproj @@ -198,7 +198,7 @@ - + diff --git a/renderdoc/driver/gl/renderdoc_gl.vcxproj.filters b/renderdoc/driver/gl/renderdoc_gl.vcxproj.filters index dd03361a1..762faf4d2 100644 --- a/renderdoc/driver/gl/renderdoc_gl.vcxproj.filters +++ b/renderdoc/driver/gl/renderdoc_gl.vcxproj.filters @@ -262,7 +262,7 @@ - + Platform Interfaces\Apple