windows: fix dedicated build

nillerusr · Dec 16, 2022 · af8c358 · af8c358
1 parent 8404418
commit af8c358
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
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:

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:

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/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 / @@ -394,7 +394,8 @@ def configure(conf): @@
     			'/Zc:forScope',
     			'/Zc:wchar_t',
     			'/GR',
-    			'/TP'
+    			'/TP',
+    			'/EHsc'
     		]
     		if conf.options.BUILD_TYPE == 'debug':
@@ Expand Down @@