Fixed UWP build

deathkiller · Feb 23, 2024 · 1b4e055 · 1b4e055
1 parent dc50c00
commit 1b4e055
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/Sources/nCine/Threading/WindowsAtomic.cpp b/Sources/nCine/Threading/WindowsAtomic.cpp
@@ -8,8 +8,8 @@ namespace nCine
 	int32_t Atomic32::load(MemoryModel memModel)
 	{
 #if defined(DEATH_TARGET_WINDOWS_RT)
-		FATAL_MSG("Incompatible memory model");
-		return 0;
+		// ReadNoFence/ReadAcquire/ReadRelease is not supported on Windows RT
+		return value_;
 #else
 		switch (memModel) {
 			case MemoryModel::RELAXED:
@@ -29,7 +29,8 @@ namespace nCine
 	void Atomic32::store(int32_t value, MemoryModel memModel)
 	{
 #if defined(DEATH_TARGET_WINDOWS_RT)
-		FATAL_MSG("Incompatible memory model");
+		// WriteNoFence/WriteAcquire/WriteRelease is not supported on Windows RT
+		value_ = value;
 #else
 		switch (memModel) {
 			case MemoryModel::RELAXED:
@@ -97,8 +98,8 @@ namespace nCine
 	int64_t Atomic64::load(MemoryModel memModel)
 	{
 #if defined(DEATH_TARGET_WINDOWS_RT)
-		FATAL_MSG("Incompatible memory model");
-		return 0;
+		// ReadNoFence/ReadAcquire/ReadRelease is not supported on Windows RT
+		return value_;
 #else
 		switch (memModel) {
 			case MemoryModel::RELAXED:
@@ -118,7 +119,8 @@ namespace nCine
 	void Atomic64::store(int64_t value, MemoryModel memModel)
 	{
 #if defined(DEATH_TARGET_WINDOWS_RT)
-		FATAL_MSG("Incompatible memory model");
+		// WriteNoFence/WriteAcquire/WriteRelease is not supported on Windows RT
+		value_ = value;
 #else
 		switch (memModel) {
 			case MemoryModel::RELAXED:

diff --git a/Sources/nCine/Threading/WindowsThread.cpp b/Sources/nCine/Threading/WindowsThread.cpp
@@ -201,7 +201,7 @@ namespace nCine
 		return false;
 #else
 		return (_sharedBlock != nullptr && ::TerminateThread(_sharedBlock->_handle, 1));
-#endif;
+#endif
 	}
 
 	ThreadAffinityMask Thread::GetAffinityMask() const

diff --git a/cmake/check_atomic.cmake b/cmake/check_atomic.cmake
@@ -1,6 +1,6 @@
 # Based on https://stackoverflow.com/q/69281559
 
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	include(CheckCXXSourceCompiles)
 	include(CMakePushCheckState)
 

diff --git a/cmake/ncine_imported_targets.cmake b/cmake/ncine_imported_targets.cmake
@@ -186,9 +186,9 @@ if(MSVC OR MINGW OR MSYS)
 				set(VC_LTL_FOUND 1)
 			endif()
 		endif()
+
+		find_package(OpenGL REQUIRED)
 	endif()
-
-	find_package(OpenGL REQUIRED)
 elseif(NOT ANDROID AND NOT NCINE_BUILD_ANDROID) # GCC and LLVM
 	if(APPLE)
 		set(CMAKE_FRAMEWORK_PATH ${NCINE_LIBS})
-Original file line number
+Diff line change
@@ Expand Up / @@ -201,7 +201,7 @@ namespace nCine @@
     		return false;
     #else
     		return (_sharedBlock != nullptr && ::TerminateThread(_sharedBlock->_handle, 1));
-    #endif;
+    #endif
     	}
     	ThreadAffinityMask Thread::GetAffinityMask() const
@@ Expand Down @@