Merge pull request #18 from JKSunny/pbr-inspector-x64-support

CMake: Add x64 support and update libs from TaystJK

.gitignore

@@ -36,6 +36,8 @@ local.properties
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+.vs
+
 # User-specific files
 *.suo
 *.user
@@ -61,11 +63,9 @@ local.properties
 *.tlb
 *.tli
 *.tlh
-*.tmp
 *.vspscc
 .builds
 *.dotCover
-.vs
 
 winquake.res
 
@@ -121,6 +121,8 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
+# Visual Studio Code
+.vscode
 
 
 ############
@@ -175,4 +177,21 @@ pip-log.txt
 ## Unix
 #############
 *.o
+*.so
+
+#############
+## clangd
+#############
+.clangd
+compile_commands.json
+
+#############
+## CLion
+#############
+.idea
 
+#############
+## CMake Builds
+#############
+[Bb]uild*/
+cmake-build-*

CMakeLists.txt

@@ -62,18 +62,18 @@ set(UseInternalPNGDefault    OFF)
 set(UseInternalJPEGDefault   OFF)
 set(UseInternalSDL2Default   OFF)
 
-if(WIN32)
-  set(UseInternalOpenALDefault ON)
-  set(UseInternalZlibDefault   ON)
-  set(UseInternalPNGDefault    ON)
-  set(UseInternalJPEGDefault   ON)
-  set(UseInternalSDL2Default   ON)
-endif()
-
-if(APPLE)
-  set(UseInternalJPEGDefault   ON)
-  set(UseInternalOpenALDefault ON)
-  set(UseInternalPNGDefault    ON)
+if(UseInternalLibs OR WIN32 OR APPLE)
+  if(WIN32)
+    set(UseInternalOpenALDefault ON)
+    set(UseInternalZlibDefault   ON)
+    set(UseInternalPNGDefault    ON)
+    set(UseInternalJPEGDefault   ON)
+    set(UseInternalSDL2Default   ON)
+  else()
+    set(UseInternalJPEGDefault ON)
+    set(UseInternalPNGDefault  ON)
+    set(UseInternalZlibDefault ON)
+  endif()
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "BSD")
@@ -92,7 +92,7 @@ if(APPLE)
 endif()
 
 # Custom CMake Modules needed
-list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/CMakeModules")
+list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_SOURCE_DIR}/cmake/Modules")
 
 Include(CheckTypeSize)
 check_type_size("void*" CMAKE_SIZEOF_VOID_P)
@@ -112,7 +112,10 @@ if(WIN32)
 	endif()
 else()
 	set(X86 OFF)
-	if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+	if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)$")
+		set(Architecture "arm64")
+		add_definitions(-DPNG_ARM_NEON_OPT=0)
+	elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
 		set(Architecture "arm")
 	elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$")
 		set(X86 ON)
@@ -195,9 +198,17 @@ if(MSVC)
 	set(SharedDefines ${SharedDefines} "_SCL_SECURE_NO_WARNINGS")
 	set(SharedDefines ${SharedDefines} "_CRT_NONSTDC_NO_DEPRECATE")
 
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /EHsc /arch:SSE2")
+	# Warnings
+	# 4244 = conversion' conversion from 'type1' to 'type2', possible loss of data
+	# 4996 = 'function': was declared deprecated
+	# 4267 = 'var' : conversion from 'size_t' to 'type', possible loss of data
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /wd4996 /wd4267")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4996 /wd4267")
 
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+	if (Architecture STREQUAL "x86")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:SSE2")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
+	endif()
 
 	# Configure MSVC Runtime
 	include(MSVCRuntime)
@@ -341,7 +352,7 @@ set(SharedCommonSafeFiles
 
 
 if(UseInternalJPEG)
-  add_subdirectory(lib/jpeg-9a)
+  add_subdirectory(lib/jpeg-9c)
 else()
   find_package(JPEG REQUIRED)
 endif()

Dockerfile

@@ -13,7 +13,7 @@ COPY . /usr/src/openjk
 # Build i386 arch
 RUN mkdir /usr/src/openjk/build.i386 &&\
 	cd /usr/src/openjk/build.i386 &&\
-	cmake -DCMAKE_TOOLCHAIN_FILE=CMakeModules/Toolchains/linux-i686.cmake \
+	cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/linux-i686.cmake \
 		-DCMAKE_INSTALL_PREFIX=/opt \
 		-DBuildMPCGame=OFF -DBuildMPEngine=OFF -DBuildMPRdVanilla=OFF -DBuildMPUI=OFF \
 		-DBuildSPEngine=OFF -DBuildSPGame=OFF -DBuildSPRdVanilla=OFF \

build/build-unix-debug.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+type cmake >/dev/null 2>&1 || { echo >&2 "Can't find cmake."; exit 1; }
+
+BUILD_DIR="`uname`-`uname -m`-debug"
+mkdir "$BUILD_DIR"
+cd "$BUILD_DIR"
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug ../..
+make

build/build-unix.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+type cmake >/dev/null 2>&1 || { echo >&2 "Can't find cmake."; exit 1; }
+
+BUILD_DIR="`uname`-`uname -m`"
+mkdir "$BUILD_DIR"
+cd "$BUILD_DIR"
+cmake -G "Unix Makefiles" ../..
+make