Update CMake build system.

muhkuh-sys · Feb 16, 2023 · f6e18bc · f6e18bc
1 parent afb00da
commit f6e18bc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/cmake/muhkuh_installation_folders.cmake b/cmake/muhkuh_installation_folders.cmake
@@ -19,3 +19,7 @@ ENDIF(NOT DEFINED INSTALL_DIR_LUA_SCRIPTS)
 IF(NOT DEFINED INSTALL_DIR_SHARED_OBJECTS)
 	SET(INSTALL_DIR_SHARED_OBJECTS  "bin")
 ENDIF(NOT DEFINED INSTALL_DIR_SHARED_OBJECTS)
+
+IF(NOT DEFINED INSTALL_DIR_DEVELOPMENT)
+	SET(INSTALL_DIR_DEVELOPMENT  "dev")
+ENDIF(NOT DEFINED INSTALL_DIR_DEVELOPMENT)
diff --git a/cmake/platform.cmake b/cmake/platform.cmake
@@ -6,7 +6,7 @@ IF((NOT DEFINED JONCHKI_PLATFORM_DIST_ID) OR (NOT DEFINED JONCHKI_PLATFORM_DIST_
 
 	# Is this a windows platform?
 	IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-		SET(JONCHKI_PLATFORM_DIST_ID       "windows")
+		SET(JONCHKI_PLATFORM_DIST_ID "windows")
 
 		# Get the CPU architecture.
 		IF(DEFINED ENV{PROCESSOR_ARCHITECTURE})

diff --git a/cmake/tools/get_dependencies.sh b/cmake/tools/get_dependencies.sh
@@ -12,3 +12,10 @@ do
 		ln -fs ${PKG_DIR}${TARGET} ${LINK}
 	fi
 done
+
+# Remove any local installed versions of libc and libpthread. These libs are
+# shipped with the compiler. Local versions in the "packages" folder might
+# conflict with the compiler builtins.
+find . -name "libc*" -delete
+find . -name "libpthread*" -delete
+find . -name "stdio.h" -delete