Skip to content

Commit ff8ea05

Browse files
author
Pham Hong Duc
committed
Update structure of Angle project
1 parent bf995d2 commit ff8ea05

File tree

107 files changed

+174
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+174
-57
lines changed

‎CMake/CMakeVisualStudioSourceGroup.cmake

+27-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,40 @@ function(setup_project_group project_source current_dir)
55
get_filename_component(source_path ${source} PATH)
66

77
# get source relative path
8-
string(REPLACE "${current_dir}/./" "" source_relative ${source_path})
9-
8+
string(REPLACE "${current_dir}/./" "" source_relative ${source_path})
9+
1010
if(MSVC OR XCODE)
1111
# get group name
1212
string(REPLACE "/" "\\" group_name ${source_relative})
1313
else()
1414
set(group_name ${source_relative})
1515
endif()
16+
17+
if("${source_relative}" STREQUAL "${source_path}")
18+
# no need group because source is in $current_dir
19+
else()
20+
# setup project group
21+
source_group("${group_name}" FILES "${source}")
22+
endif()
23+
endforeach()
24+
endfunction()
25+
26+
function(setup_project_group_by_folder_relative project_source current_dir)
27+
foreach(source IN LISTS project_source)
28+
# get source path
29+
get_filename_component(source_path ${source} PATH)
1630

31+
# get source relative path
32+
string(REPLACE "${current_dir}" "" source_relative ${source_path})
33+
34+
if(MSVC OR XCODE)
35+
# get group name
36+
string(REPLACE "/" "\\" group_name ${source_relative})
37+
set(group_name "Source Files\\${group_name}")
38+
else()
39+
set(group_name "Source Files\\${source_relative}")
40+
endif()
41+
1742
if("${source_relative}" STREQUAL "${source_path}")
1843
# no need group because source is in $current_dir
1944
else()

‎Projects/Template/Platforms/MacOS/anglebase/base_export.h ‎Projects/Apple/Angle/anglebase/base_export.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/containers/mru_cache.h ‎Projects/Apple/Angle/anglebase/containers/mru_cache.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/logging.h ‎Projects/Apple/Angle/anglebase/logging.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/macros.h ‎Projects/Apple/Angle/anglebase/macros.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/no_destructor.h ‎Projects/Apple/Angle/anglebase/no_destructor.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/OWNERS ‎Projects/Apple/Angle/anglebase/numerics/OWNERS

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/checked_math.h ‎Projects/Apple/Angle/anglebase/numerics/checked_math.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/checked_math_impl.h ‎Projects/Apple/Angle/anglebase/numerics/checked_math_impl.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/clamped_math.h ‎Projects/Apple/Angle/anglebase/numerics/clamped_math.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/clamped_math_impl.h ‎Projects/Apple/Angle/anglebase/numerics/clamped_math_impl.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/math_constants.h ‎Projects/Apple/Angle/anglebase/numerics/math_constants.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/ranges.h ‎Projects/Apple/Angle/anglebase/numerics/ranges.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/safe_conversions.h ‎Projects/Apple/Angle/anglebase/numerics/safe_conversions.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/safe_conversions_arm_impl.h ‎Projects/Apple/Angle/anglebase/numerics/safe_conversions_arm_impl.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/safe_conversions_impl.h ‎Projects/Apple/Angle/anglebase/numerics/safe_conversions_impl.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/safe_math.h ‎Projects/Apple/Angle/anglebase/numerics/safe_math.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/safe_math_arm_impl.h ‎Projects/Apple/Angle/anglebase/numerics/safe_math_arm_impl.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/safe_math_clang_gcc_impl.h ‎Projects/Apple/Angle/anglebase/numerics/safe_math_clang_gcc_impl.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/numerics/safe_math_shared_impl.h ‎Projects/Apple/Angle/anglebase/numerics/safe_math_shared_impl.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/sha1.cc ‎Projects/Apple/Angle/anglebase/sha1.cc

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/sha1.h ‎Projects/Apple/Angle/anglebase/sha1.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/sys_byteorder.h ‎Projects/Apple/Angle/anglebase/sys_byteorder.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/anglebase/trace_event/trace_event.h ‎Projects/Apple/Angle/anglebase/trace_event/trace_event.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/Optional.h ‎Projects/Apple/Angle/common/Optional.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/PackedCLEnums_autogen.cpp ‎Projects/Apple/Angle/common/PackedCLEnums_autogen.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/PackedCLEnums_autogen.h ‎Projects/Apple/Angle/common/PackedCLEnums_autogen.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/PackedEGLEnums_autogen.cpp ‎Projects/Apple/Angle/common/PackedEGLEnums_autogen.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/PackedEGLEnums_autogen.h ‎Projects/Apple/Angle/common/PackedEGLEnums_autogen.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/PackedEnums.cpp ‎Projects/Apple/Angle/common/PackedEnums.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/PackedEnums.h ‎Projects/Apple/Angle/common/PackedEnums.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/PackedGLEnums_autogen.cpp ‎Projects/Apple/Angle/common/PackedGLEnums_autogen.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/PackedGLEnums_autogen.h ‎Projects/Apple/Angle/common/PackedGLEnums_autogen.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/android_util.cpp ‎Projects/Apple/Angle/common/android_util.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/android_util.h ‎Projects/Apple/Angle/common/android_util.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/angleutils.cpp ‎Projects/Apple/Angle/common/angleutils.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/angleutils.h ‎Projects/Apple/Angle/common/angleutils.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/bitset_utils.h ‎Projects/Apple/Angle/common/bitset_utils.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/debug.cpp ‎Projects/Apple/Angle/common/debug.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/debug.h ‎Projects/Apple/Angle/common/debug.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/entry_points_enum_autogen.cpp ‎Projects/Apple/Angle/common/entry_points_enum_autogen.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/entry_points_enum_autogen.h ‎Projects/Apple/Angle/common/entry_points_enum_autogen.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/mathutil.cpp ‎Projects/Apple/Angle/common/mathutil.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/mathutil.h ‎Projects/Apple/Angle/common/mathutil.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/platform.h ‎Projects/Apple/Angle/common/platform.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/string_utils.cpp ‎Projects/Apple/Angle/common/string_utils.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/string_utils.h ‎Projects/Apple/Angle/common/string_utils.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/system_utils.cpp ‎Projects/Apple/Angle/common/system_utils.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/system_utils.h ‎Projects/Apple/Angle/common/system_utils.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/system_utils_apple.cpp ‎Projects/Apple/Angle/common/system_utils_apple.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/system_utils_mac.cpp ‎Projects/Apple/Angle/common/system_utils_mac.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/system_utils_posix.cpp ‎Projects/Apple/Angle/common/system_utils_posix.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/utilities.cpp ‎Projects/Apple/Angle/common/utilities.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/common/utilities.h ‎Projects/Apple/Angle/common/utilities.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/EGLPlatformParameters.h ‎Projects/Apple/Angle/util/EGLPlatformParameters.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/EGLWindow.cpp ‎Projects/Apple/Angle/util/EGLWindow.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/EGLWindow.h ‎Projects/Apple/Angle/util/EGLWindow.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/Event.h ‎Projects/Apple/Angle/util/Event.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/OSPixmap.h ‎Projects/Apple/Angle/util/OSPixmap.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/OSWindow.cpp ‎Projects/Apple/Angle/util/OSWindow.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/OSWindow.h ‎Projects/Apple/Angle/util/OSWindow.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/Timer.cpp ‎Projects/Apple/Angle/util/Timer.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/Timer.h ‎Projects/Apple/Angle/util/Timer.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/angle_features_autogen.cpp ‎Projects/Apple/Angle/util/angle_features_autogen.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/angle_features_autogen.h ‎Projects/Apple/Angle/util/angle_features_autogen.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/com_utils.h ‎Projects/Apple/Angle/util/com_utils.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/egl_loader_autogen.cpp ‎Projects/Apple/Angle/util/egl_loader_autogen.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/egl_loader_autogen.h ‎Projects/Apple/Angle/util/egl_loader_autogen.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/gles_loader_autogen.cpp ‎Projects/Apple/Angle/util/gles_loader_autogen.cpp

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/gles_loader_autogen.h ‎Projects/Apple/Angle/util/gles_loader_autogen.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/keyboard.h ‎Projects/Apple/Angle/util/keyboard.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/mouse.h ‎Projects/Apple/Angle/util/mouse.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/osx/OSXPixmap.h ‎Projects/Apple/Angle/util/osx/OSXPixmap.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/osx/OSXPixmap.mm ‎Projects/Apple/Angle/util/osx/OSXPixmap.mm

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/osx/OSXWindow.h ‎Projects/Apple/Angle/util/osx/OSXWindow.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/osx/OSXWindow.mm ‎Projects/Apple/Angle/util/osx/OSXWindow.mm

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/util_export.h ‎Projects/Apple/Angle/util/util_export.h

File renamed without changes.

‎Projects/Template/Platforms/MacOS/util/util_gl.h ‎Projects/Apple/Angle/util/util_gl.h

File renamed without changes.

‎Projects/Apple/Audio/CDriverAudioUnitFunction.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ void AudioSetupStreamBufferLength(float time)
2020
printf("[SkylichtAudio] Error: AudioSetupStreamBufferLength\n");
2121
}
2222
}
23-
#endif
23+
#endif

‎Projects/Editor/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ endif()
9191
if (BUILD_MACOS)
9292
# Angle API
9393
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
94+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9495
include_directories(${template_path}/Platforms/MacOS)
9596

9697
file(GLOB_RECURSE platform_mac_source
@@ -101,11 +102,13 @@ if (BUILD_MACOS)
101102
${template_path}/Platforms/MacOS/**.mm
102103
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
103104
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
104-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
106+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
107+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
105108

106109
list (APPEND application_source ${platform_mac_source})
107110

108-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
111+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
109112

110113
# Generate header source path
111114
set(path_content "#define PROJECT_PATH \"${SKYLICHT_ENGINE_SOURCE_DIR}/Assets\"")

‎Projects/Irrlicht/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif()
2323
# Angle include
2424
if(BUILD_MACOS)
2525
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
26-
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Template/Platforms/MacOS)
26+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
2727
endif()
2828

2929
if(CYGWIN)

‎Samples/Audio/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ endif()
8989
if (BUILD_MACOS)
9090
# Angle API
9191
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
92+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9293
include_directories(${template_path}/Platforms/MacOS)
9394

9495
file(GLOB_RECURSE platform_mac_source
@@ -98,11 +99,14 @@ if (BUILD_MACOS)
9899
${template_path}/Platforms/MacOS/**.m
99100
${template_path}/Platforms/MacOS/**.mm
100101
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
101-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
102+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
103+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
104+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
102106

103107
list (APPEND application_source ${platform_mac_source})
104108

105-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
109+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
106110
endif()
107111

108112
if (BUILD_DEBUG_VLD)

‎Samples/BlendShape/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ endif()
8989
if (BUILD_MACOS)
9090
# Angle API
9191
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
92+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9293
include_directories(${template_path}/Platforms/MacOS)
9394

9495
file(GLOB_RECURSE platform_mac_source
@@ -98,11 +99,14 @@ if (BUILD_MACOS)
9899
${template_path}/Platforms/MacOS/**.m
99100
${template_path}/Platforms/MacOS/**.mm
100101
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
101-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
102+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
103+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
104+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
102106

103107
list (APPEND application_source ${platform_mac_source})
104108

105-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
109+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
106110
endif()
107111

108112
if (BUILD_DEBUG_VLD)

‎Samples/Collision/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ endif()
8989
if (BUILD_MACOS)
9090
# Angle API
9191
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
92+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9293
include_directories(${template_path}/Platforms/MacOS)
9394

9495
file(GLOB_RECURSE platform_mac_source
@@ -98,11 +99,14 @@ if (BUILD_MACOS)
9899
${template_path}/Platforms/MacOS/**.m
99100
${template_path}/Platforms/MacOS/**.mm
100101
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
101-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
102+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
103+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
104+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
102106

103107
list (APPEND application_source ${platform_mac_source})
104108

105-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
109+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
106110
endif()
107111

108112
if (BUILD_DEBUG_VLD)

‎Samples/DrawPrimitives/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ endif()
8686
if (BUILD_MACOS)
8787
# Angle API
8888
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
89+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
8990
include_directories(${template_path}/Platforms/MacOS)
9091

9192
file(GLOB_RECURSE platform_mac_source
@@ -96,11 +97,13 @@ if (BUILD_MACOS)
9697
${template_path}/Platforms/MacOS/**.mm
9798
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
9899
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
99-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
100+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
101+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
102+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
100103

101104
list (APPEND application_source ${platform_mac_source})
102105

103-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
106+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
104107
endif()
105108

106109
if (BUILD_DEBUG_VLD)

‎Samples/HelloWorld/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ endif()
8686
if (BUILD_MACOS)
8787
# Angle API
8888
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
89+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
8990
include_directories(${template_path}/Platforms/MacOS)
9091

9192
file(GLOB_RECURSE platform_mac_source
@@ -96,11 +97,13 @@ if (BUILD_MACOS)
9697
${template_path}/Platforms/MacOS/**.mm
9798
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
9899
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
99-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
100+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
101+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
102+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
100103

101104
list (APPEND application_source ${platform_mac_source})
102105

103-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
106+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
104107
endif()
105108

106109
if (BUILD_DEBUG_VLD)

‎Samples/Instancing/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ endif()
8989
if (BUILD_MACOS)
9090
# Angle API
9191
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
92+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9293
include_directories(${template_path}/Platforms/MacOS)
9394

9495
file(GLOB_RECURSE platform_mac_source
@@ -98,11 +99,14 @@ if (BUILD_MACOS)
9899
${template_path}/Platforms/MacOS/**.m
99100
${template_path}/Platforms/MacOS/**.mm
100101
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
101-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
102+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
103+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
104+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
102106

103107
list (APPEND application_source ${platform_mac_source})
104108

105-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
109+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
106110
endif()
107111

108112
if (BUILD_DEBUG_VLD)

‎Samples/Lightmap/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ endif()
8989
if (BUILD_MACOS)
9090
# Angle API
9191
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
92+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9293
include_directories(${template_path}/Platforms/MacOS)
9394

9495
file(GLOB_RECURSE platform_mac_source
@@ -98,11 +99,14 @@ if (BUILD_MACOS)
9899
${template_path}/Platforms/MacOS/**.m
99100
${template_path}/Platforms/MacOS/**.mm
100101
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
101-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
102+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
103+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
104+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
102106

103107
list (APPEND application_source ${platform_mac_source})
104108

105-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
109+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
106110
endif()
107111

108112
if (BUILD_DEBUG_VLD)

‎Samples/LightmapUV/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ endif()
8686
if (BUILD_MACOS)
8787
# Angle API
8888
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
89+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
8990
include_directories(${template_path}/Platforms/MacOS)
9091

9192
file(GLOB_RECURSE platform_mac_source
@@ -96,11 +97,13 @@ if (BUILD_MACOS)
9697
${template_path}/Platforms/MacOS/**.mm
9798
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
9899
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
99-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
100+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
101+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
102+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
100103

101104
list (APPEND application_source ${platform_mac_source})
102105

103-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
106+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
104107
endif()
105108

106109
if (BUILD_DEBUG_VLD)

‎Samples/Lightmapping/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ endif()
8989
if (BUILD_MACOS)
9090
# Angle API
9191
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
92+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9293
include_directories(${template_path}/Platforms/MacOS)
9394

9495
file(GLOB_RECURSE platform_mac_source
@@ -99,11 +100,13 @@ if (BUILD_MACOS)
99100
${template_path}/Platforms/MacOS/**.mm
100101
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
101102
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
102-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
103+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
104+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
103106

104107
list (APPEND application_source ${platform_mac_source})
105108

106-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
109+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
107110
endif()
108111

109112
if (BUILD_DEBUG_VLD)

‎Samples/LightmappingDirectional/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ endif()
8989
if (BUILD_MACOS)
9090
# Angle API
9191
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
92+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9293
include_directories(${template_path}/Platforms/MacOS)
9394

9495
file(GLOB_RECURSE platform_mac_source
@@ -98,11 +99,14 @@ if (BUILD_MACOS)
9899
${template_path}/Platforms/MacOS/**.m
99100
${template_path}/Platforms/MacOS/**.mm
100101
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
101-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
102+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
103+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
104+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
102106

103107
list (APPEND application_source ${platform_mac_source})
104108

105-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
109+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
106110
endif()
107111

108112
if (BUILD_DEBUG_VLD)

‎Samples/LightmappingVertex/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ endif()
8989
if (BUILD_MACOS)
9090
# Angle API
9191
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
92+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9293
include_directories(${template_path}/Platforms/MacOS)
9394

9495
file(GLOB_RECURSE platform_mac_source
@@ -99,11 +100,13 @@ if (BUILD_MACOS)
99100
${template_path}/Platforms/MacOS/**.mm
100101
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
101102
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
102-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
103+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
104+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
103106

104107
list (APPEND application_source ${platform_mac_source})
105108

106-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
109+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
107110
endif()
108111

109112
if (BUILD_DEBUG_VLD)

‎Samples/LuckyDraw/CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ endif()
8989
if (BUILD_MACOS)
9090
# Angle API
9191
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Angle/include)
92+
include_directories(${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/Angle)
9293
include_directories(${template_path}/Platforms/MacOS)
9394

9495
file(GLOB_RECURSE platform_mac_source
@@ -99,11 +100,13 @@ if (BUILD_MACOS)
99100
${template_path}/Platforms/MacOS/**.mm
100101
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.h
101102
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.m
102-
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm)
103+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.mm
104+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.cpp
105+
${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple/*.c)
103106

104107
list (APPEND application_source ${platform_mac_source})
105108

106-
setup_project_group("${platform_mac_source}" ${CMAKE_CURRENT_SOURCE_DIR})
109+
setup_project_group_by_folder_relative("${platform_mac_source}" "${SKYLICHT_ENGINE_SOURCE_DIR}/Projects/Apple")
107110
endif()
108111

109112
if (BUILD_DEBUG_VLD)

0 commit comments

Comments
 (0)