From b34b6a0778299201f34358afff33190acd16eca2 Mon Sep 17 00:00:00 2001 From: Roman Chistokhodov Date: Thu, 17 Jun 2021 21:33:55 +0300 Subject: [PATCH] Fix windows build (#179) * Add hl.def to cmakelists.txt * Add appveyor artifact --- appveyor.yml | 15 +++++++-------- dlls/CMakeLists.txt | 6 ++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index eb39ee2d..bb4ba61d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,13 +1,7 @@ version: 1.0.{build} -branches: - only: - - master - environment: matrix: - - os: Visual Studio 2013 - GENERATOR_NAME: "Visual Studio 12 2013" - os: Visual Studio 2015 GENERATOR_NAME: "Visual Studio 14 2015" # TODO: Uncomment when AppVeyor will provide XP toolchain for VS2017 @@ -17,7 +11,7 @@ environment: clone_folder: c:\projects\xash\hlsdk-xash3d build: - project: INSTALL.vcxproj + project: build/INSTALL.vcxproj verbosity: normal configuration: @@ -25,4 +19,9 @@ configuration: before_build: - git submodule update --init --recursive - - cmake -G "%GENERATOR_NAME%" + - cmake -G "%GENERATOR_NAME%" -B build -DGOLDSOURCE_SUPPORT=ON -DCMAKE_INSTALL_PREFIX="dist" + +artifacts: + - path: dist + name: hlsdk-msvc + type: zip diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt index 67a34e11..497c02cd 100644 --- a/dlls/CMakeLists.txt +++ b/dlls/CMakeLists.txt @@ -150,6 +150,12 @@ set (SVDLL_SOURCES include_directories (. wpn_shared ../common ../engine ../pm_shared ../game_shared ../public) +if(MSVC) + set(SVDLL_SOURCES + ${SVDLL_SOURCES} + hl.def) +endif() + if(USE_VOICEMGR) set(SVDLL_SOURCES ${SVDLL_SOURCES}