Commit 702467a 1 parent 33ede26 commit 702467a Copy full SHA for 702467a
File tree 5 files changed +4
-212
lines changed
5 files changed +4
-212
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ target_sources(libultraship PRIVATE ${Source_Files__Resource} ${Source_Files__Re
134
134
135
135
#=================== Graphic ===================
136
136
137
- file (GLOB Source_Files__Graphic RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "graphic/Fast3D/*.h" "graphic/Fast3D/*.cpp" "graphic/Fast3D/*.c" )
137
+ file (GLOB Source_Files__Graphic RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "graphic/Fast3D/*.h" "graphic/Fast3D/*.hpp" "graphic/Fast3D/*. cpp" "graphic/Fast3D/*.c" )
138
138
139
139
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows" )
140
140
list (FILTER Source_Files__Graphic EXCLUDE REGEX "graphic/Fast3D/gfx_dxgi*" )
@@ -144,6 +144,7 @@ endif()
144
144
145
145
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS" )
146
146
list (FILTER Source_Files__Graphic EXCLUDE REGEX "graphic/Fast3D/gfx_metal*" )
147
+ list (FILTER Source_Files__Graphic EXCLUDE REGEX "graphic/Fast3D/metal-cpp/*" )
147
148
endif ()
148
149
149
150
if (CMAKE_SYSTEM_NAME STREQUAL "iOS" )
@@ -153,12 +154,6 @@ endif()
153
154
source_group ("graphic" FILES ${Source_Files__Graphic} )
154
155
target_sources (libultraship PRIVATE ${Source_Files__Graphic} )
155
156
156
- #=================== metal-cpp ===================
157
-
158
- if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS" )
159
- target_include_directories (libultraship PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} /../extern/metal-cpp)
160
- endif ()
161
-
162
157
#=================== Packages & Includes ===================
163
158
164
159
target_include_directories (libultraship
Original file line number Diff line number Diff line change 26
26
#define NS_PRIVATE_IMPLEMENTATION
27
27
#define CA_PRIVATE_IMPLEMENTATION
28
28
#define MTL_PRIVATE_IMPLEMENTATION
29
- #include < Metal /Metal.hpp>
29
+ #include " metal-cpp /Metal.hpp"
30
30
#include < SDL_render.h>
31
31
#include < imgui_impl_metal.h>
32
32
#include < spdlog/spdlog.h>
Original file line number Diff line number Diff line change 7
7
8
8
#ifdef __APPLE__
9
9
10
- #include < Metal /Metal.hpp>
10
+ #include " metal-cpp /Metal.hpp"
11
11
12
12
#include " gfx_metal_shader.h"
13
13
Original file line number Diff line number Diff line change @@ -19556,4 +19556,3 @@ _MTL_INLINE void MTL::VisibleFunctionTable::setFunctions(const MTL::FunctionHand
19556
19556
((major < METALCPP_VERSION_MAJOR) || \
19557
19557
(major == METALCPP_VERSION_MAJOR && minor < METALCPP_VERSION_MINOR) || \
19558
19558
(major == METALCPP_VERSION_MAJOR && minor == METALCPP_VERSION_MINOR && patch <= METALCPP_VERSION_PATCH))
19559
-
You can’t perform that action at this time.
0 commit comments