Merge branch 'sohl1.2' into aomdc

Author: nekonomicon

.github/workflows/build.yml

@@ -135,3 +135,45 @@ jobs:
         name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows-vgui
         path: dist-vgui/${{ steps.extract_gamedir.outputs.gamedir }}
 
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    needs: [build]
+    steps:
+      - name: Fetch artifacts
+        if: ${{ github.event_name == 'push' && !github.event.pull_request }}
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts/
+
+      - name: Remove old release
+        uses: dev-drprasad/[email protected]
+        if: ${{ github.event_name == 'push' && !github.event.pull_request }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: continuous-${{ github.ref_name }}
+          delete_release: true
+
+      - name: Prepare release
+        if: ${{ github.event_name == 'push' && !github.event.pull_request }}
+        continue-on-error: true
+        run: |
+          cd artifacts/
+          for i in hlsdk-*; do
+            zip -r "$i" "$i"
+            rm -rf "$i"
+          done
+          cd ..
+          sleep 20s
+
+      - name: Upload new release
+        if: ${{ github.event_name == 'push' && !github.event.pull_request }}
+        uses: softprops/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          files: artifacts/hlsdk-*.zip
+          tag_name: continuous-${{ github.ref_name }}
+          draft: false
+          prerelease: true
+          name: hlsdk-portable ${{ github.ref_name }} development build

Android.mk

@@ -49,6 +49,7 @@ option(BUILD_CLIENT "Build client dll" ON)
 option(BUILD_SERVER "Build server dll" ON)
 option(LTO "Enable interprocedural optimization" OFF)
 option(POLLY "Enable pollyhedral optimization" OFF)
+option(ANDROID_APK "Enable APK styled deploy" OFF)
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 	set(CMAKE_INSTALL_PREFIX "")
@@ -96,24 +97,6 @@ endif()
 CHECK_FUNCTION_EXISTS(strlcpy HAVE_STRLCPY)
 CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT)
 
-execute_process(COMMAND "git" "describe" "--dirty" "--always"
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_VERSION
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-execute_process(COMMAND "git" "rev-parse" "--abbrev-ref" "HEAD"
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_BRANCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-if(GIT_VERSION)
-	add_definitions(-DXASH_BUILD_COMMIT="${GIT_VERSION}")
-endif()
-
-if(GIT_BRANCH)
-	add_definitions(-DXASH_BUILD_BRANCH="${GIT_BRANCH}")
-endif()
-
 file(STRINGS "mod_options.txt" MOD_OPTIONS_STRINGS REGEX "^([A-Za-z0-9_-]+)=([A-Za-z0-9_-]+)\ \#\ (.*)$")
 foreach(LINE IN LISTS MOD_OPTIONS_STRINGS)
 	# file() itself doesn't populate CMAKE_MATCH_<n>, so
@@ -132,11 +115,18 @@ foreach(LINE IN LISTS MOD_OPTIONS_STRINGS)
 				message(STATUS ${CMAKE_MATCH_3} " is disabled")
 			endif()
 		else()
+			message(STATUS ${CMAKE_MATCH_3} " set to " ${CMAKE_MATCH_2})
 			set(${CMAKE_MATCH_1} "${CMAKE_MATCH_2}" CACHE STRING "${CMAKE_MATCH_3}")
 		endif()
 	endif()
 endforeach()
 
+if(ANDROID_APK)
+	set(GAMEDIR ".")
+	set(SERVER_INSTALL_DIR ".")
+	set(CLIENT_INSTALL_DIR ".")
+endif()
+
 if(HLDEMO_BUILD AND OEM_BUILD)
 	message(FATAL_ERROR "Don't mix Demo and OEM builds!")
 endif()
@@ -215,6 +205,8 @@ if(HAVE_TGMATH_H)
 	endif()
 endif()
 
+add_subdirectory(game_shared)
+
 if(BUILD_CLIENT)
 	message(STATUS "Building client enabled")
 	add_subdirectory(cl_dll)

CMakeLists.txt

@@ -128,7 +128,6 @@ set (CLDLL_SOURCES
 	tri.cpp
 	util.cpp
 	view.cpp
-	../game_shared/vcs_info.cpp
 	../public/safe_snprintf.c
 )
 
@@ -203,6 +202,7 @@ if(USE_VOICEMGR)
 endif()
 
 add_library (${CLDLL_LIBRARY} SHARED ${CLDLL_SOURCES})
+target_link_libraries(${CLDLL_LIBRARY} vcs_info)
 
 if (GOLDSOURCE_SUPPORT)
 	target_link_libraries( ${CLDLL_LIBRARY} ${CMAKE_DL_LIBS} )
@@ -231,27 +231,20 @@ endif()
 set_target_properties (${CLDLL_LIBRARY} PROPERTIES
 	POSITION_INDEPENDENT_CODE 1)
 
-if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android" OR XASH_TERMUX)
-	set(CLDLL_NAME "client")
-	set_target_properties(${CLDLL_LIBRARY} PROPERTIES
-		OUTPUT_NAME "${CLDLL_NAME}${POSTFIX}"
-		PREFIX "")
-endif()
+set_target_postfix(${CLDLL_LIBRARY})
 
-if(MSVC)
-	set_property(TARGET ${CLDLL_LIBRARY} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-endif()
+set_property(TARGET ${CLDLL_LIBRARY} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
 if(HAVE_LTO)
 	set_property(TARGET ${CLDLL_LIBRARY} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
 endif()
 
-install( TARGETS ${CLDLL_LIBRARY}
+install(TARGETS ${CLDLL_LIBRARY}
 	RUNTIME DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/"
 	LIBRARY DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/"
 	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-	    GROUP_READ GROUP_EXECUTE
-		WORLD_READ WORLD_EXECUTE )
+		GROUP_READ GROUP_EXECUTE
+		WORLD_READ WORLD_EXECUTE)
 
 if(CMAKE_BUILD_TYPE MATCHES "Release" AND NOT WIN32)
 	add_custom_command(TARGET ${CLDLL_LIBRARY}

cl_dll/Android.mk

@@ -339,7 +339,6 @@ StudioSlerpBones
 void CStudioModelRenderer::StudioSlerpBones( vec4_t q1[], float pos1[][3], vec4_t q2[], float pos2[][3], float s )
 {
 	int i;
-	vec4_t q3;
 	float s1;
 
 	if( s < 0.0f )
@@ -349,13 +348,28 @@ void CStudioModelRenderer::StudioSlerpBones( vec4_t q1[], float pos1[][3], vec4_
 
 	s1 = 1.0f - s;
 
+	switch (m_pStudioHeader->numbones % 4)
+	{
+	case 3:
+		QuaternionSlerp( q1[0], q2[0], s, q1[0] );
+		QuaternionSlerp( q1[1], q2[1], s, q1[1] );
+		QuaternionSlerp( q1[2], q2[2], s, q1[2] );
+		break;
+	case 2:
+		QuaternionSlerp( q1[0], q2[0], s, q1[0] );
+		QuaternionSlerp( q1[1], q2[1], s, q1[1] );
+		break;
+	case 1:
+		QuaternionSlerp( q1[0], q2[0], s, q1[0] );
+		break;
+	case 0:
+		break;
+	}
+	for ( i = m_pStudioHeader->numbones % 4; i < m_pStudioHeader->numbones; i += 4 )
+		QuaternionSlerpX4( q1 + i, q2 + i, s, q1 + i );
+
 	for( i = 0; i < m_pStudioHeader->numbones; i++ )
 	{
-		QuaternionSlerp( q1[i], q2[i], s, q3 );
-		q1[i][0] = q3[0];
-		q1[i][1] = q3[1];
-		q1[i][2] = q3[2];
-		q1[i][3] = q3[3];
 		pos1[i][0] = pos1[i][0] * s1 + pos2[i][0] * s;
 		pos1[i][1] = pos1[i][1] * s1 + pos2[i][1] * s;
 		pos1[i][2] = pos1[i][2] * s1 + pos2[i][2] * s;