Skip to content

Commit cb911c0

Browse files
TheMostDiligentTheMostDiligent
committed
Improved module structure
1 parent 884d3d8 commit cb911c0

61 files changed

Lines changed: 156 additions & 152 deletions

File tree

Some content is hidden

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

‎CMakeLists.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,13 @@ function(add_sample_app APP_NAME IDE_FOLDER SOURCE INCLUDE SHADERS ASSETS)
9595
endfunction()
9696

9797
add_subdirectory(ThirdParty)
98-
add_subdirectory(Samples)
99-
add_subdirectory(Tutorials)
98+
if(TARGET NativeAppBase)
99+
add_subdirectory(SampleBase)
100+
endif()
101+
if(TARGET SampleBase)
102+
add_subdirectory(Samples)
103+
add_subdirectory(Tutorials)
104+
endif()
100105

101106
file(RELATIVE_PATH SAMPLES_ROOT_REL_PATH "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}")
102107
install(FILES License.txt DESTINATION "${SAMPLES_ROOT_REL_PATH}/Licenses" RENAME DiligentEngine-License.txt)

Samples/SampleBase/CMakeLists.txt renamed to SampleBase/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,5 +171,5 @@ if(PLATFORM_WIN32)
171171
endif()
172172

173173
set_target_properties(SampleBase PROPERTIES
174-
FOLDER Samples
174+
FOLDER DiligentSamples
175175
)

Samples/SampleBase/include/Android/InputControllerAndroid.h renamed to SampleBase/include/Android/InputControllerAndroid.h

File renamed without changes.

Samples/SampleBase/include/FirstPersonCamera.h renamed to SampleBase/include/FirstPersonCamera.h

File renamed without changes.

Samples/SampleBase/include/InputController.h renamed to SampleBase/include/InputController.h

File renamed without changes.

Samples/SampleBase/include/Linux/InputControllerLinux.h renamed to SampleBase/include/Linux/InputControllerLinux.h

File renamed without changes.

Samples/SampleBase/include/MacOS/InputControllerMacOS.h renamed to SampleBase/include/MacOS/InputControllerMacOS.h

File renamed without changes.

Samples/SampleBase/include/SampleApp.h renamed to SampleBase/include/SampleApp.h

File renamed without changes.

Samples/SampleBase/include/SampleBase.h renamed to SampleBase/include/SampleBase.h

File renamed without changes.

Samples/SampleBase/include/UWP/InputControllerUWP.h renamed to SampleBase/include/UWP/InputControllerUWP.h

File renamed without changes.

0 commit comments

Comments
 (0)