Browse Source

Update Appveyor and GitHub actions build

Michael Ragazzon 5 years ago
parent
commit
7727bbbbd6
2 changed files with 10 additions and 5 deletions
  1. 9 4
      .appveyor.yml
  2. 1 1
      .github/workflows/build.yml

+ 9 - 4
.appveyor.yml

@@ -36,14 +36,17 @@ install:
     cmake --build . --target rlottie --config Release -- "/clp:ErrorsOnly"
     cd ../../../
     
-    mkdir Build-Dynamic, Build-Static
+    mkdir Build-Dynamic, Build-Static, Build-Samples
     
     cd Build-Dynamic
-    cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=ON -DBUILD_SAMPLES=ON -DWARNINGS_AS_ERRORS=ON ..
+    cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=ON -DBUILD_SAMPLES=OFF -DWARNINGS_AS_ERRORS=ON ..
 
     cd ../Build-Static
     cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=OFF -DBUILD_SAMPLES=OFF -DWARNINGS_AS_ERRORS=ON ..
     
+    cd ../Build-Samples
+    cmake -G "%VS_GENERATOR%" -DBUILD_SHARED_LIBS=ON -DENABLE_LOTTIE_PLUGIN=ON -DBUILD_SAMPLES=ON -DWARNINGS_AS_ERRORS=ON ..
+    
     cd ..
     
 build_script:
@@ -56,6 +59,8 @@ build_script:
     
     msbuild Build-Static/RmlUi.sln  /p:configuration=release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
     
+    msbuild Build-Samples/RmlUi.sln  /p:configuration=release /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+    
 after_build:
 - cmd: |-
     mkdir Bin
@@ -67,8 +72,8 @@ after_build:
     cp ../Build-Static/Release/Rml*.lib Static-Release
     cd ..
     
-    cp Build-Dynamic/Release/*.exe Samples
-    cp Bin/Dynamic-Release/*.dll Samples
+    cp Build-Samples/Release/*.exe Samples
+    cp Build-Samples/Release/Rml*.dll Samples
     cp Dependencies/lib/*.dll Samples
 
     mv Dependencies/lib/ Dependencies/freetype-%FREETYPE_VER%

+ 1 - 1
.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
             cmake_options: -DENABLE_PRECOMPILED_HEADERS=OFF
           - cmake_options: -DBUILD_TESTING=ON -DENABLE_PRECOMPILED_HEADERS=OFF
             enable_testing: true
-          - cmake_options: -DNO_FONT_INTERFACE_DEFAULT=ON
+          - cmake_options: -DNO_FONT_INTERFACE_DEFAULT=ON -DENABLE_LOTTIE_PLUGIN=ON
           - cmake_options: -DDISABLE_RTTI_AND_EXCEPTIONS=ON
           - cmake_options: -DNO_THIRDPARTY_CONTAINERS=ON