nillerusr · nillerusr · Dec 16, 2022 · Dec 16, 2022 · Dec 16, 2022 · Dec 17, 2022
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,12 +1,6 @@
 name: Build
 
-on:
-  push:
-    branches:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
+on: [push, pull_request]
 
 jobs:
   build-linux-i386:
@@ -47,6 +41,17 @@ jobs:
         ./waf.bat configure -T debug
         ./waf.bat build
 
+  build-windows-amd64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build windows-i386
+      run: |
+        git submodule init && git submodule update
+        ./waf.bat configure -T debug -8
+        ./waf.bat build
+
   build-dedicated-windows-i386:
     runs-on: windows-2019
 
@@ -58,6 +63,17 @@ jobs:
         ./waf.bat configure -T debug -d
         ./waf.bat build
 
+  build-dedicated-windows-amd64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build dedicated windows-amd64
+      run: |
+        git submodule init && git submodule update
+        ./waf.bat configure -T debug -d -8
+        ./waf.bat build
+
   build-dedicated-linux-i386:
     runs-on: ubuntu-18.04
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,12 +1,6 @@
 name: Tests
 
-on:
-  push:
-    branches:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
+on: [push, pull_request]
 
 jobs:
   tests-linux-i386:
@@ -40,3 +34,17 @@ jobs:
         cd out
         $env:Path = "bin";
         ./unittest.exe
+
+  tests-windows-amd64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run tests windows-amd64
+      run: |
+        git submodule init && git submodule update
+        ./waf.bat configure -T release --tests --prefix=out/ -8
+        ./waf.bat install
+        cd out
+        $env:Path = "bin";
+        ./unittest.exe
diff --git a/dedicated/sys_ded.cpp b/dedicated/sys_ded.cpp
@@ -470,7 +470,7 @@ bool CDedicatedSteamApplication::Create( )
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)
 {
-#ifndef POSIX
+#if !defined( POSIX ) && !defined( PLATFORM_64BITS )
 	_asm
 	{
 		fninit

diff --git a/game/client/client_thinklist.cpp b/game/client/client_thinklist.cpp
@@ -158,7 +158,7 @@ void CClientThinkList::RemoveThinkable( ClientThinkHandle_t hThink )
 	{
 		pThink->SetThinkHandle( INVALID_THINK_HANDLE );
 	}
-	m_ThinkEntries.Remove( (unsigned long)hThink );
+	m_ThinkEntries.Remove( (uintp)hThink );
 }
 
 
@@ -304,7 +304,7 @@ void CClientThinkList::PerformThinkFunctions()
 		if ( hThink != INVALID_THINK_HANDLE )
 		{
 			// This can happen if the same think handle was removed twice
-			if ( !m_ThinkEntries.IsInList( (unsigned long)hThink ) )
+			if ( !m_ThinkEntries.IsInList( (uintp)hThink ) )
 				continue;
 
 			// NOTE: This is necessary for the case where the client entity handle

diff --git a/game/client/client_thinklist.h b/game/client/client_thinklist.h
@@ -121,7 +121,7 @@ inline ClientThinkHandle_t CClientThinkList::GetInvalidThinkHandle()
 
 inline CClientThinkList::ThinkEntry_t* CClientThinkList::GetThinkEntry( ClientThinkHandle_t hThink )
 {
-	return &m_ThinkEntries[ (unsigned long)hThink ];
+	return &m_ThinkEntries[ (uintp)hThink ];
 }
 
 

diff --git a/game/client/clientleafsystem.cpp b/game/client/clientleafsystem.cpp
@@ -1337,7 +1337,7 @@ void CClientLeafSystem::ComputeTranslucentRenderLeaf( int count, const LeafIndex
 
 	static CUtlVector<RenderableInfo_t *> orderedList; // @MULTICORE (toml 8/30/2006): will need to make non-static if thread this function
 	static CUtlVector<IClientRenderable *> renderablesToUpdate;
-	int leaf = 0;
+	intp leaf = 0;
 	for ( i = 0; i < count; ++i )
 	{
 		leaf = pLeafList[i];

diff --git a/ivp b/ivp
diff --git a/public/tier1/memhelpers.h b/public/tier1/memhelpers.h
@@ -19,7 +19,7 @@ namespace memutils
 	}
 
 	template<typename T>
-	inline void set( T *dest, T value, size_t n )
+	inline void set( T *dest, const T &value, size_t n )
 	{
 		do
 		{

diff --git a/wscript b/wscript
@@ -394,7 +394,8 @@ def configure(conf):
 			'/Zc:forScope',
 			'/Zc:wchar_t',
 			'/GR',
-			'/TP'
+			'/TP',
+			'/EHsc'
 		]
 
 		if conf.options.BUILD_TYPE == 'debug':
-Original file line number
+Diff line change
@@ Expand Up @@
     inline CClientThinkList::ThinkEntry_t* CClientThinkList::GetThinkEntry( ClientThinkHandle_t hThink )
     {
-    	return &m_ThinkEntries[ (unsigned long)hThink ];
+    	return &m_ThinkEntries[ (uintp)hThink ];
     }
@@ Expand Down @@
+3 −3		havana/havok/hk_base/base_types.h
+0 −0		havana/havok/hk_base/wscript
+33 −32		havana/havok/hk_math/vector_fpu/vector_fpu.inl
+2 −1		havana/havok/hk_math/wscript
+0 −0		havana/wscript
+2 −2		ivp_compact_builder/ivp_surbuild_pointsoup.cxx
+3 −3		ivp_compact_builder/ivp_tetra_intrude.cxx
+1 −1		ivp_compact_builder/qhull_mem.hxx
+0 −0		ivp_compact_builder/wscript
+16 −16		ivp_intern/ivp_great_matrix.cxx
+4 −4		ivp_intern/ivp_time.cxx
+0 −0		ivp_physics/wscript