CMake: Fix building scale2x by moving condition

Author: carstene1ns

CMakeLists.txt

@@ -148,7 +148,7 @@ else()
 	set(SDL_STATUS "SDL2")
 endif()
 
-# bundled libraries
+# common bundled libraries
 
 add_subdirectory(ext)
 
@@ -186,6 +186,7 @@ if(SCALE)
 	set(SCALE_STATUS "Enabled, scale2x")
 	target_compile_definitions(OpenJazz PRIVATE SCALE)
 	set(OJ_LIBS_SCALE scale2x)
+	add_subdirectory(ext/scale2x)
 elseif(NOT LEGACY_SDL)
 	# FIXME: add codepath for gpu scaling
 	set(SCALE_STATUS "Disabled (currently broken in SDL2 port)")

ext/CMakeLists.txt

@@ -28,22 +28,3 @@ add_library(psmplug STATIC
 	psmplug/tables.h
 )
 target_include_directories(psmplug PUBLIC psmplug)
-
-if(SCALE)
-	# scale2x
-
-	include(Find-Restrict-Keyword)
-
-	add_library(scale2x STATIC
-		scale2x/scale2x.cpp
-		scale2x/scale2x.h
-		scale2x/scale3x.cpp
-		scale2x/scale3x.h
-		scale2x/scalebit.cpp
-		scale2x/scalebit.h
-	)
-	target_compile_definitions(scale2x PRIVATE
-		USE_SCALE_RANDOMWRITE
-		restrict=${RESTRICT_KEYWORD})
-	target_include_directories(scale2x PUBLIC scale2x)
-endif()

ext/scale2x/CMakeLists.txt

@@ -0,0 +1,16 @@
+# scale2x
+
+include(Find-Restrict-Keyword)
+
+add_library(scale2x STATIC
+	scale2x.cpp
+	scale2x.h
+	scale3x.cpp
+	scale3x.h
+	scalebit.cpp
+	scalebit.h
+)
+target_compile_definitions(scale2x PRIVATE
+	USE_SCALE_RANDOMWRITE
+	restrict=${RESTRICT_KEYWORD})
+target_include_directories(scale2x PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})