From 35c190c3577e4719720c5e0abea6e8c9a09f4a03 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Fri, 16 Dec 2022 19:47:53 +0300 Subject: [PATCH] windows: fix dedicated build --- .github/workflows/build.yml | 8 +------- .github/workflows/tests.yml | 8 +------- dedicated/sys_ded.cpp | 2 +- wscript | 3 ++- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4e2a14c8e..c51b0f8d61 100644 --- 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 index 3a99a7f251..4974855efd 100644 --- 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 index c7a9be92fc..f1ff4449de 100644 --- 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 index 5c12bf40fd..c2f869496a 100644 --- 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':