windows: fix dedicated build

nillerusr · nillerusr · commit af8c358ce974 · 2022-12-16T19:47:53.000+03:00
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 number	Diff line change
`@@ -470,7 +470,7 @@ bool CDedicatedSteamApplication::Create( )`
`470`	`470`	`//-----------------------------------------------------------------------------`
`471`	`471`	`int main(int argc, char **argv)`
`472`	`472`	`{`
`473`		`-#ifndef POSIX`
	`473`	`+#if !defined( POSIX ) && !defined( PLATFORM_64BITS )`
`474`	`474`	`_asm`
`475`	`475`	`{`
`476`	`476`	`fninit`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,8 @@ def configure(conf):`
`394`	`394`	`'/Zc:forScope',`
`395`	`395`	`'/Zc:wchar_t',`
`396`	`396`	`'/GR',`
`397`		`- '/TP'`
	`397`	`+ '/TP',`
	`398`	`+ '/EHsc'`
`398`	`399`	`]`
`399`	`400`
`400`	`401`	`if conf.options.BUILD_TYPE == 'debug':`