diff --git a/.gitignore b/.gitignore index 33424d9..e2e312b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ cJSON_test_utils libcjson.so.* libcjson_utils.so.* *.orig +.vscode diff --git a/appveyor-patch.ps1 b/appveyor-patch.ps1 deleted file mode 100644 index b380d53..0000000 --- a/appveyor-patch.ps1 +++ /dev/null @@ -1,13 +0,0 @@ -# Script to patch Appveyor build environment for Visual Studio 2008 64bit - -$url = "https://github.com/menpo/condaci/raw/master/vs2008_patch.zip" -$output = "$pwd\build\vs2008_patch.zip" - -(New-Object System.Net.WebClient).DownloadFile($url, $output) - -7z -e "$pwd\build\vs2008_patch.zip" -cmd.exe /c "$pwd\build\vs2008_patch\setup_x64.bat" - -copy C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat - - diff --git a/appveyor.yml b/appveyor.yml index f9c586a..e23eb64 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -66,13 +66,15 @@ environment: platform: - x86 - x64 + exclude: + - platform: x64 + GENERATOR: "Visual Studio 9 2008" configuration: - Release build_script: - - ps: if($env:PLATFORM -eq "x64" -And $GENERATOR -eq 'Visual Studio 9 2008') { .\appveyor-patch.ps1 } - ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" } - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DENABLE_CJSON_TEST=%ENABLE_CJSON_TEST% -H. -Bbuild - cmake --build build --config "%CONFIGURATION%"