diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-31 03:38:22 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-31 03:38:22 +0000 |
| commit | 103f0c2ab0c9c4c54d168b98a86bc10d0dac0449 (patch) | |
| tree | 39a18d20139cac465b7316ab11bfcd73069778c2 /NativeApp | |
| parent | Fixed a bunch of minor Linux/iOS/MacOS build issues (diff) | |
| download | DiligentTools-103f0c2ab0c9c4c54d168b98a86bc10d0dac0449.tar.gz DiligentTools-103f0c2ab0c9c4c54d168b98a86bc10d0dac0449.zip | |
Renamed .h -> .hpp where appropriate
Diffstat (limited to 'NativeApp')
| -rw-r--r-- | NativeApp/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | NativeApp/include/Android/AndroidAppBase.hpp (renamed from NativeApp/include/Android/AndroidAppBase.h) | 2 | ||||
| -rw-r--r-- | NativeApp/include/AppBase.hpp (renamed from NativeApp/include/AppBase.h) | 0 | ||||
| -rw-r--r-- | NativeApp/include/IOS/IOSAppBase.hpp (renamed from NativeApp/include/IOS/IOSAppBase.h) | 2 | ||||
| -rw-r--r-- | NativeApp/include/Linux/LinuxAppBase.hpp (renamed from NativeApp/include/Linux/LinuxAppBase.h) | 2 | ||||
| -rw-r--r-- | NativeApp/include/MacOS/MacOSAppBase.hpp (renamed from NativeApp/include/MacOS/MacOSAppBase.h) | 2 | ||||
| -rw-r--r-- | NativeApp/include/NativeAppBase.hpp (renamed from NativeApp/include/NativeAppBase.h) | 12 | ||||
| -rw-r--r-- | NativeApp/include/UWP/UWPAppBase.hpp (renamed from NativeApp/include/UWP/UWPAppBase.h) | 2 | ||||
| -rw-r--r-- | NativeApp/include/Win32/Win32AppBase.hpp (renamed from NativeApp/include/Win32/Win32AppBase.h) | 2 | ||||
| -rw-r--r-- | NativeApp/src/Android/AndroidAppBase.cpp | 2 | ||||
| -rw-r--r-- | NativeApp/src/Android/AndroidMain.cpp | 2 | ||||
| -rw-r--r-- | NativeApp/src/IOS/IOSAppBase.cpp | 2 | ||||
| -rw-r--r-- | NativeApp/src/Linux/LinuxMain.cpp | 2 | ||||
| -rw-r--r-- | NativeApp/src/MacOS/MacOSAppBase.cpp | 2 | ||||
| -rw-r--r-- | NativeApp/src/UWP/UWPAppBase.cpp | 2 | ||||
| -rw-r--r-- | NativeApp/src/UWP/dummy.cpp | 2 | ||||
| -rw-r--r-- | NativeApp/src/Win32/WinMain.cpp | 2 |
17 files changed, 29 insertions, 29 deletions
diff --git a/NativeApp/CMakeLists.txt b/NativeApp/CMakeLists.txt index 3e75406..8de0804 100644 --- a/NativeApp/CMakeLists.txt +++ b/NativeApp/CMakeLists.txt @@ -15,7 +15,7 @@ if(PLATFORM_WIN32) src/Win32/WinMain.cpp ) set(INCLUDE - include/Win32/Win32AppBase.h + include/Win32/Win32AppBase.hpp ) function(add_win32_app TARGET_NAME SOURCE INCLUDE ASSETS) @@ -41,7 +41,7 @@ elseif(PLATFORM_UNIVERSAL_WINDOWS) src/UWP/dummy.cpp ) set(INCLUDE - include/UWP/UWPAppBase.h + include/UWP/UWPAppBase.hpp ) # Windows Runtime types cannot be included into static libraries @@ -60,7 +60,7 @@ elseif(PLATFORM_UNIVERSAL_WINDOWS) ${NATIVE_APP_SOURCE_DIR}/src/UWP/Common/DeviceResources.h ${NATIVE_APP_SOURCE_DIR}/src/UWP/Common/DirectXHelper.h ${NATIVE_APP_SOURCE_DIR}/src/UWP/App.h - ${NATIVE_APP_SOURCE_DIR}/include/UWP/UWPAppBase.h + ${NATIVE_APP_SOURCE_DIR}/include/UWP/UWPAppBase.hpp ${NATIVE_APP_SOURCE_DIR}/src/UWP/Common/StepTimer.h ) @@ -88,7 +88,7 @@ elseif(PLATFORM_ANDROID) src/Android/AndroidAppBase.cpp ) set(INCLUDE - include/Android/AndroidAppBase.h + include/Android/AndroidAppBase.hpp ) function(add_android_app TARGET_NAME SOURCE INCLUDE ASSETS) get_target_property(NATIVE_APP_SOURCE_DIR NativeAppBase SOURCE_DIR) @@ -124,7 +124,7 @@ elseif(PLATFORM_LINUX) src/Linux/LinuxMain.cpp ) set(INCLUDE - include/Linux/LinuxAppBase.h + include/Linux/LinuxAppBase.hpp ) function(add_linux_app TARGET_NAME SOURCE INCLUDE ASSETS) add_executable(${TARGET_NAME} ${SOURCE} ${INCLUDE} ${ASSETS}) @@ -141,7 +141,7 @@ elseif(PLATFORM_MACOS) src/MacOS/MacOSAppBase.cpp ) set(INCLUDE - include/MacOS/MacOSAppBase.h + include/MacOS/MacOSAppBase.hpp ) function(add_macos_app TARGET_NAME SOURCE INCLUDE ASSETS) @@ -230,7 +230,7 @@ elseif(PLATFORM_IOS) src/IOS/IOSAppBase.cpp ) set(INCLUDE - include/IOS/IOSAppBase.h + include/IOS/IOSAppBase.hpp ) function(add_ios_app TARGET_NAME SOURCE INCLUDE ASSETS) @@ -316,8 +316,8 @@ else() endif() list(APPEND INCLUDE - include/AppBase.h - include/NativeAppBase.h + include/AppBase.hpp + include/NativeAppBase.hpp ) diff --git a/NativeApp/include/Android/AndroidAppBase.h b/NativeApp/include/Android/AndroidAppBase.hpp index 0b291c6..fa42798 100644 --- a/NativeApp/include/Android/AndroidAppBase.h +++ b/NativeApp/include/Android/AndroidAppBase.hpp @@ -26,7 +26,7 @@ #include <memory> #include <android_native_app_glue.h> -#include "AppBase.h" +#include "AppBase.hpp" #include "NDKHelper.h" diff --git a/NativeApp/include/AppBase.h b/NativeApp/include/AppBase.hpp index 4f7414b..4f7414b 100644 --- a/NativeApp/include/AppBase.h +++ b/NativeApp/include/AppBase.hpp diff --git a/NativeApp/include/IOS/IOSAppBase.h b/NativeApp/include/IOS/IOSAppBase.hpp index c7def32..61a4f0d 100644 --- a/NativeApp/include/IOS/IOSAppBase.h +++ b/NativeApp/include/IOS/IOSAppBase.hpp @@ -23,7 +23,7 @@ #pragma once -#include "AppBase.h" +#include "AppBase.hpp" #include "Timer.hpp" namespace Diligent diff --git a/NativeApp/include/Linux/LinuxAppBase.h b/NativeApp/include/Linux/LinuxAppBase.hpp index 3d98606..e0bbda7 100644 --- a/NativeApp/include/Linux/LinuxAppBase.h +++ b/NativeApp/include/Linux/LinuxAppBase.hpp @@ -45,7 +45,7 @@ # include <xcb/xcb.h> #endif -#include "AppBase.h" +#include "AppBase.hpp" namespace Diligent { diff --git a/NativeApp/include/MacOS/MacOSAppBase.h b/NativeApp/include/MacOS/MacOSAppBase.hpp index 34bc47c..87f7702 100644 --- a/NativeApp/include/MacOS/MacOSAppBase.h +++ b/NativeApp/include/MacOS/MacOSAppBase.hpp @@ -23,7 +23,7 @@ #pragma once -#include "AppBase.h" +#include "AppBase.hpp" #include "Timer.hpp" namespace Diligent diff --git a/NativeApp/include/NativeAppBase.h b/NativeApp/include/NativeAppBase.hpp index 3792b04..281b85a 100644 --- a/NativeApp/include/NativeAppBase.h +++ b/NativeApp/include/NativeAppBase.hpp @@ -30,7 +30,7 @@ #if PLATFORM_WIN32 - #include "Win32AppBase.h" + #include "Win32AppBase.hpp" namespace Diligent { using NativeAppBase = Win32AppBase; @@ -38,7 +38,7 @@ #elif PLATFORM_UNIVERSAL_WINDOWS - #include "UWPAppBase.h" + #include "UWPAppBase.hpp" namespace Diligent { using NativeAppBase = UWPAppBase; @@ -46,7 +46,7 @@ #elif PLATFORM_LINUX - #include "LinuxAppBase.h" + #include "LinuxAppBase.hpp" namespace Diligent { using NativeAppBase = LinuxAppBase; @@ -54,7 +54,7 @@ #elif PLATFORM_ANDROID - #include "AndroidAppBase.h" + #include "AndroidAppBase.hpp" namespace Diligent { using NativeAppBase = AndroidAppBase; @@ -62,7 +62,7 @@ #elif PLATFORM_MACOS - #include "MacOSAppBase.h" + #include "MacOSAppBase.hpp" namespace Diligent { using NativeAppBase = MacOSAppBase; @@ -70,7 +70,7 @@ #elif PLATFORM_IOS - #include "IOSAppBase.h" + #include "IOSAppBase.hpp" namespace Diligent { using NativeAppBase = IOSAppBase; diff --git a/NativeApp/include/UWP/UWPAppBase.h b/NativeApp/include/UWP/UWPAppBase.hpp index cc0c71e..c7ef79f 100644 --- a/NativeApp/include/UWP/UWPAppBase.h +++ b/NativeApp/include/UWP/UWPAppBase.hpp @@ -30,7 +30,7 @@ #include <wrl.h> #include <wrl/client.h> -#include "AppBase.h" +#include "AppBase.hpp" #include "Common/StepTimer.h" #include "Common/DeviceResources.h" diff --git a/NativeApp/include/Win32/Win32AppBase.h b/NativeApp/include/Win32/Win32AppBase.hpp index 840d9a9..99f7fea 100644 --- a/NativeApp/include/Win32/Win32AppBase.h +++ b/NativeApp/include/Win32/Win32AppBase.hpp @@ -32,7 +32,7 @@ #endif #include <Windows.h> -#include "AppBase.h" +#include "AppBase.hpp" namespace Diligent { diff --git a/NativeApp/src/Android/AndroidAppBase.cpp b/NativeApp/src/Android/AndroidAppBase.cpp index 5c21dc6..9ee5a87 100644 --- a/NativeApp/src/Android/AndroidAppBase.cpp +++ b/NativeApp/src/Android/AndroidAppBase.cpp @@ -21,7 +21,7 @@ * of the possibility of such damages. */ -#include "AndroidAppBase.h" +#include "AndroidAppBase.hpp" #include "Timer.hpp" #include <android/sensor.h> diff --git a/NativeApp/src/Android/AndroidMain.cpp b/NativeApp/src/Android/AndroidMain.cpp index b37bf88..e3b96d3 100644 --- a/NativeApp/src/Android/AndroidMain.cpp +++ b/NativeApp/src/Android/AndroidMain.cpp @@ -26,7 +26,7 @@ #include <errno.h> #include "PlatformDefinitions.h" -#include "NativeAppBase.h" +#include "NativeAppBase.hpp" #define HELPER_CLASS_NAME "com/android/helper/NDKHelper" //Class name of helper function diff --git a/NativeApp/src/IOS/IOSAppBase.cpp b/NativeApp/src/IOS/IOSAppBase.cpp index f091443..8d89741 100644 --- a/NativeApp/src/IOS/IOSAppBase.cpp +++ b/NativeApp/src/IOS/IOSAppBase.cpp @@ -21,7 +21,7 @@ * of the possibility of such damages. */ -#include "IOSAppBase.h" +#include "IOSAppBase.hpp" namespace Diligent { diff --git a/NativeApp/src/Linux/LinuxMain.cpp b/NativeApp/src/Linux/LinuxMain.cpp index ca4a8cd..1ae58de 100644 --- a/NativeApp/src/Linux/LinuxMain.cpp +++ b/NativeApp/src/Linux/LinuxMain.cpp @@ -25,7 +25,7 @@ #include <iomanip> #include "PlatformDefinitions.h" -#include "NativeAppBase.h" +#include "NativeAppBase.hpp" #include "StringTools.hpp" #include "Timer.hpp" #include "Errors.hpp" diff --git a/NativeApp/src/MacOS/MacOSAppBase.cpp b/NativeApp/src/MacOS/MacOSAppBase.cpp index e126c85..ca281e0 100644 --- a/NativeApp/src/MacOS/MacOSAppBase.cpp +++ b/NativeApp/src/MacOS/MacOSAppBase.cpp @@ -21,7 +21,7 @@ * of the possibility of such damages. */ -#include "MacOSAppBase.h" +#include "MacOSAppBase.hpp" namespace Diligent { diff --git a/NativeApp/src/UWP/UWPAppBase.cpp b/NativeApp/src/UWP/UWPAppBase.cpp index 346b2bd..b85528c 100644 --- a/NativeApp/src/UWP/UWPAppBase.cpp +++ b/NativeApp/src/UWP/UWPAppBase.cpp @@ -21,7 +21,7 @@ * of the possibility of such damages. */ -#include "UWPAppBase.h" +#include "UWPAppBase.hpp" namespace Diligent { diff --git a/NativeApp/src/UWP/dummy.cpp b/NativeApp/src/UWP/dummy.cpp index 5caae53..ee2591e 100644 --- a/NativeApp/src/UWP/dummy.cpp +++ b/NativeApp/src/UWP/dummy.cpp @@ -1,4 +1,4 @@ -#include "AppBase.h" +#include "AppBase.hpp" // This dummy file is only required for the NativeAppBase.lib to be created, // which is required to avoid linker error diff --git a/NativeApp/src/Win32/WinMain.cpp b/NativeApp/src/Win32/WinMain.cpp index 1a9bcd0..62b206f 100644 --- a/NativeApp/src/Win32/WinMain.cpp +++ b/NativeApp/src/Win32/WinMain.cpp @@ -31,7 +31,7 @@ #include <Windows.h> #include <crtdbg.h> -#include "NativeAppBase.h" +#include "NativeAppBase.hpp" #include "StringTools.hpp" #include "Timer.hpp" |
