windows: fix dedicated build

2 years ago · af8c358ce9
4 changed files with 5 additions and 16 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,12 +1,6 @@
				@@ -1,12 +1,6 @@
 name: Build

-on:
-  push:
-    branches:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
+on: [push, pull_request]

 jobs:
  build-linux-i386:
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -1,12 +1,6 @@
				@@ -1,12 +1,6 @@
 name: Tests

-on:
-  push:
-    branches:
-      - "*"
-  pull_request:
-    branches:
-      - "*"
+on: [push, pull_request]

 jobs:
  tests-linux-i386:
--- a/dedicated/sys_ded.cpp
+++ b/dedicated/sys_ded.cpp
@ -470,7 +470,7 @@ bool CDedicatedSteamApplication::Create( )
				@@ -470,7 +470,7 @@ bool CDedicatedSteamApplication::Create( )
 //-----------------------------------------------------------------------------
 int main(int argc, char **argv)
 {
-#ifndef POSIX
+#if !defined( POSIX ) && !defined( PLATFORM_64BITS )
 	_asm
 	{
 		fninit
--- a/3
+++ b/3
@ -394,7 +394,8 @@ def configure(conf):
				@@ -394,7 +394,8 @@ def configure(conf):
 			'/Zc:forScope',
 			'/Zc:wchar_t',
 			'/GR',
-			'/TP'
+			'/TP',
+			'/EHsc'
 		]
 		
 		if conf.options.BUILD_TYPE == 'debug':