From 2ac564092d039e8eda022a41c585cb23ebfe52b9 Mon Sep 17 00:00:00 2001 From: Jeanjean Pierre Date: Thu, 29 Aug 2019 11:33:46 +0200 Subject: [PATCH] Add Windows build through AppVeyor CI --- .travis.yml | 68 ---------------- Aegisub.sln | 2 +- appveyor.yml | 81 +++++++++++++++++++ build/Aegisub/Aegisub.targets | 2 +- build/Aegisub/Aegisub.vcxproj | 2 +- build/Aegisub/Aegisub.vcxproj.filters | 2 +- build/Aegisub/standard-libraries.props | 2 +- build/BuildTasks/BuildTasks.csproj | 2 +- build/DefaultConfiguration.props | 2 +- .../PortableInstaller.vcxproj | 2 +- .../PortableInstaller.vcxproj.filters | 2 +- build/aegisub.props | 2 +- build/boost/boost.vcxproj | 2 +- build/boost/boost.vcxproj.filters | 2 +- build/csrihelper/csrihelper.vcxproj | 2 +- build/csrihelper/csrihelper.vcxproj.filters | 2 +- build/expat/expat.vcxproj | 2 +- build/expat/expat.vcxproj.filters | 2 +- build/ffmpeg/ffmpeg.vcxproj | 2 +- build/ffmpeg/ffmpeg.vcxproj.filters | 2 +- build/ffms2/ffms2.vcxproj | 2 +- build/ffms2/ffms2.vcxproj.filters | 2 +- build/fftw/fftw.vcxproj | 2 +- build/fftw/fftw.vcxproj.filters | 2 +- build/freetype2/freetype.vcxproj | 2 +- build/freetype2/freetype.vcxproj.filters | 2 +- build/fribidi/fribidi.vcxproj | 2 +- build/fribidi/fribidi.vcxproj.filters | 2 +- build/googletest/googletest.vcxproj | 2 +- build/googletest/googletest.vcxproj.filters | 2 +- build/hunspell/hunspell.vcxproj | 2 +- build/hunspell/hunspell.vcxproj.filters | 2 +- build/icu/icu.vcxproj | 2 +- build/icu/icu.vcxproj.filters | 2 +- build/install.targets | 2 +- build/libaegisub/libaegisub.vcxproj | 2 +- build/libaegisub/libaegisub.vcxproj.filters | 2 +- build/libass/libass.vcxproj | 4 +- build/libass/libass.vcxproj.filters | 2 +- build/libiconv/libiconv.vcxproj | 2 +- build/libiconv/libiconv.vcxproj.filters | 2 +- build/libpng/libpng.vcxproj | 2 +- build/libpng/libpng.vcxproj.filters | 2 +- build/libresrc/libresrc.vcxproj | 2 +- build/libresrc/libresrc.vcxproj.filters | 2 +- build/luabins/luabins.vcxproj | 2 +- build/luabins/luabins.vcxproj.filters | 2 +- build/luajit-buildvm/luajit-buildvm.vcxproj | 2 +- .../luajit-buildvm.vcxproj.filters | 2 +- build/luajit-minilua/luajit-minilua.vcxproj | 2 +- .../luajit-minilua.vcxproj.filters | 2 +- build/luajit/luajit.vcxproj | 2 +- build/luajit/luajit.vcxproj.filters | 2 +- build/paths.props | 2 +- build/respack.targets | 2 +- build/scintilla/scintilla.vcxproj | 2 +- build/scintilla/scintilla.vcxproj.filters | 2 +- build/standard-outdirs.props | 2 +- build/standard-settings.props | 2 +- build/tasks.props | 2 +- build/tests/tests.vcxproj | 2 +- build/tests/tests.vcxproj.filters | 2 +- .../universalchardet/universalchardet.vcxproj | 2 +- .../universalchardet.vcxproj.filters | 2 +- build/userconfig/ft2.props.sample | 2 +- build/userconfig/paths.props.sample | 2 +- build/userconfig/wx.props.sample | 2 +- build/version.sh | 2 +- build/wx/wxWidgets.vcxproj | 2 +- build/yasm.targets | 2 +- build/zlib/zlib.vcxproj | 2 +- .../win_installer/fragment_automation.iss | 2 - packages/win_installer/fragment_codecs.iss | 8 +- packages/win_installer/fragment_setupbase.iss | 14 +--- packages/win_installer/fragment_strings.iss | 20 ----- .../win_installer/fragment_translations.iss | 52 ++++++------ vendor/libass | 2 +- 77 files changed, 186 insertions(+), 201 deletions(-) delete mode 100644 .travis.yml create mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 421119d72..000000000 --- a/.travis.yml +++ /dev/null @@ -1,68 +0,0 @@ -sudo: required -dist: trusty -language: cpp - -git: - submodules: false - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - libasound2-dev - - libfftw3-dev - - libhunspell-dev - - yasm - - libfribidi-dev - - libass-dev - - libicu-dev - - luarocks - - g++-5 - -matrix: - include: - - compiler: gcc - env: BOOST_VERSION=55 - - compiler: gcc - env: BOOST_VERSION=60 - before_install: - - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5 --slave /usr/bin/gcov gcov /usr/bin/gcov-5 - -install: - # Can't install these via the apt addon due to the whitelist - - sudo apt-get install -y -qq libffms2-dev libwxgtk3.0-dev libuchardet-dev - - - sudo pip install cpp-coveralls - - sudo luarocks install busted > /dev/null - - sudo luarocks install moonscript > /dev/null - - sudo luarocks install uuid > /dev/null - - - git submodule --quiet init - - git submodule --quiet update vendor/googletest - - - cd vendor - - rm -rf boost - - wget http://sourceforge.net/projects/boost/files/boost/1.${BOOST_VERSION}.0/boost_1_${BOOST_VERSION}_0.tar.bz2/download - - tar xjf download - - mv boost_1_${BOOST_VERSION}_0 boost - - cd boost - - ./bootstrap.sh - - ./b2 -j3 -layout=system threading=multi cxxflags=-std=c++11 link=shared variant=release --without-python --without-iostreams --without-serialization --without-graph --without-log --without-math --without-signals --without-test --without-wave --without-mpi --without-program_options --without-graph_parallel --without-context --without-coroutine --without-random --without-timer --without-date_time - - cd ../.. - -script: - - export CPATH=$(pwd)/vendor/boost - - export LD_LIBRARY_PATH=$(pwd)/vendor/boost/stage/lib:$LD_LIBRARY_PATH - - export CPPFLAGS="-fprofile-arcs -ftest-coverage" - - export LIBS="-lgcov" - - autoreconf -if - - ./configure BOOST_LDFLAGS="-L$(pwd)/vendor/boost/stage/lib" --enable-debug || cat config.log - - make -j3 all test - - coveralls --exclude vendor --exclude src --exclude build --exclude tools --exclude libaegisub/windows > /dev/null - -notifications: - email: - - on_success: change - - on_failure: change - diff --git a/Aegisub.sln b/Aegisub.sln index c8bdcada0..16de2b90c 100644 --- a/Aegisub.sln +++ b/Aegisub.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30324.0 +VisualStudioVersion = 15.0.28307.168 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aegisub", "build\Aegisub\Aegisub.vcxproj", "{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}" ProjectSection(ProjectDependencies) = postProject diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..d740e10d5 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,81 @@ +image: Visual Studio 2017 + +install: + - cd %APPVEYOR_BUILD_FOLDER% + - git submodule update --init --recursive + - set PATH=C:\gettext\bin;"C:\Program Files (x86)\Inno Setup 5";C:\yasm;%PATH% + - mkdir C:\yasm + - curl -o "C:\yasm\yasm.exe" http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe + - mkdir C:\gettext + - curl -L -o "C:\gettext.zip" https://github.com/vslavik/gettext-tools-windows/releases/download/v0.20.1/gettext-tools-windows-0.20.1.zip + - cd C:\gettext + - 7z x C:\gettext.zip + +build_script: + - cd %APPVEYOR_BUILD_FOLDER% + - MSBuild.exe Aegisub.sln /target:BuildTasks + - MSBuild.exe Aegisub.sln /m /p:Configuration=Release /p:Platform=x64 + +after_build: + - curl -o "C:\aegisub-codecs.zip" http://mugen.karaokes.moe/downloads/aegisub-codecs.zip + - cd %APPVEYOR_BUILD_FOLDER% + - msgfmt.exe -o po\ar.mo po\ar.po + - msgfmt.exe -o po\wxstd-ar.mo vendor\wxWidgets\locale\ar.po + - msgfmt.exe -o po\bg.mo po\bg.po + - msgfmt.exe -o po\ca.mo po\ca.po + - msgfmt.exe -o po\wxstd-ca.mo vendor\wxWidgets\locale\ca.po + - msgfmt.exe -o po\cs.mo po\cs.po + - msgfmt.exe -o po\wxstd-cs.mo vendor\wxWidgets\locale\cs.po + - msgfmt.exe -o po\da.mo po\da.po + - msgfmt.exe -o po\wxstd-da.mo vendor\wxWidgets\locale\da.po + - msgfmt.exe -o po\de.mo po\de.po + - msgfmt.exe -o po\wxstd-de.mo vendor\wxWidgets\locale\de.po + - msgfmt.exe -o po\el.mo po\el.po + - msgfmt.exe -o po\wxstd-el.mo vendor\wxWidgets\locale\el.po + - msgfmt.exe -o po\es.mo po\es.po + - msgfmt.exe -o po\wxstd-es.mo vendor\wxWidgets\locale\es.po + - msgfmt.exe -o po\eu.mo po\eu.po + - msgfmt.exe -o po\wxstd-eu.mo vendor\wxWidgets\locale\eu.po + - msgfmt.exe -o po\fa.mo po\fa.po + - msgfmt.exe -o po\fi.mo po\fi.po + - msgfmt.exe -o po\wxstd-fi.mo vendor\wxWidgets\locale\fi.po + - msgfmt.exe -o po\fr_FR.mo po\fr_FR.po + - msgfmt.exe -o po\wxstd-fr.mo vendor\wxWidgets\locale\fr.po + - msgfmt.exe -o po\gl.mo po\gl.po + - msgfmt.exe -o po\wxstd-gl_ES.mo vendor\wxWidgets\locale\gl_ES.po + - msgfmt.exe -o po\hu.mo po\hu.po + - msgfmt.exe -o po\wxstd-hu.mo vendor\wxWidgets\locale\hu.po + - msgfmt.exe -o po\id.mo po\id.po + - msgfmt.exe -o po\wxstd-id.mo vendor\wxWidgets\locale\id.po + - msgfmt.exe -o po\it.mo po\it.po + - msgfmt.exe -o po\wxstd-it.mo vendor\wxWidgets\locale\it.po + - msgfmt.exe -o po\ja.mo po\ja.po + - msgfmt.exe -o po\wxstd-ja.mo vendor\wxWidgets\locale\ja.po + - msgfmt.exe -o po\ko.mo po\ko.po + - msgfmt.exe -o po\wxstd-ko_KR.mo vendor\wxWidgets\locale\ko_KR.po + - msgfmt.exe -o po\nl.mo po\nl.po + - msgfmt.exe -o po\wxstd-nl.mo vendor\wxWidgets\locale\nl.po + - msgfmt.exe -o po\pl.mo po\pl.po + - msgfmt.exe -o po\wxstd-pl.mo vendor\wxWidgets\locale\pl.po + - msgfmt.exe -o po\pt_BR.mo po\pt_BR.po + - msgfmt.exe -o po\wxstd-pt_BR.mo vendor\wxWidgets\locale\pt_BR.po + - msgfmt.exe -o po\pt_PT.mo po\pt_PT.po + - msgfmt.exe -o po\wxstd-pt.mo vendor\wxWidgets\locale\pt.po + - msgfmt.exe -o po\ru.mo po\ru.po + - msgfmt.exe -o po\wxstd-ru.mo vendor\wxWidgets\locale\ru.po + - msgfmt.exe -o po\sr_RS.mo po\sr_RS.po + - msgfmt.exe -o po\sr_RS@latin.mo po\sr_RS@latin.po + - msgfmt.exe -o po\uk_UA.mo po\uk_UA.po + - msgfmt.exe -o po\wxstd-uk_UA.mo vendor\wxWidgets\locale\uk_UA.po + - msgfmt.exe -o po\vi.mo po\vi.po + - msgfmt.exe -o po\wxstd-vi.mo vendor\wxWidgets\locale\vi.po + - msgfmt.exe -o po\zh_CN.mo po\zh_CN.po + - msgfmt.exe -o po\wxstd-zh_CN.mo vendor\wxWidgets\locale\zh_CN.po + - msgfmt.exe -o po\zh_TW.mo po\zh_TW.po + - msgfmt.exe -o po\wxstd-zh_TW.mo vendor\wxWidgets\locale\zh_TW.po + - 7z x "C:\aegisub-codecs.zip" + - cd packages\win_installer + - iscc aegisub3.iss + +artifacts: + - path: packages\win_installer\output\Aegisub-Japan7-x64.exe diff --git a/build/Aegisub/Aegisub.targets b/build/Aegisub/Aegisub.targets index 78d939088..0885047e6 100644 --- a/build/Aegisub/Aegisub.targets +++ b/build/Aegisub/Aegisub.targets @@ -29,7 +29,7 @@ Aegisub Project http://www.aegisub.org/ --> - + diff --git a/build/Aegisub/Aegisub.vcxproj b/build/Aegisub/Aegisub.vcxproj index 9d5ae17af..a6d78d915 100644 --- a/build/Aegisub/Aegisub.vcxproj +++ b/build/Aegisub/Aegisub.vcxproj @@ -1,5 +1,5 @@ - + {9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A} diff --git a/build/Aegisub/Aegisub.vcxproj.filters b/build/Aegisub/Aegisub.vcxproj.filters index d8c2da283..15364a1f8 100644 --- a/build/Aegisub/Aegisub.vcxproj.filters +++ b/build/Aegisub/Aegisub.vcxproj.filters @@ -1,5 +1,5 @@ - + {b5d22cd4-b7ec-48ad-b78b-948b41e5dc15} diff --git a/build/Aegisub/standard-libraries.props b/build/Aegisub/standard-libraries.props index b4f5074e1..db14112d4 100644 --- a/build/Aegisub/standard-libraries.props +++ b/build/Aegisub/standard-libraries.props @@ -1,5 +1,5 @@ - + diff --git a/build/BuildTasks/BuildTasks.csproj b/build/BuildTasks/BuildTasks.csproj index 4bbea1f2b..ca7b10918 100644 --- a/build/BuildTasks/BuildTasks.csproj +++ b/build/BuildTasks/BuildTasks.csproj @@ -1,5 +1,5 @@  - + Debug diff --git a/build/DefaultConfiguration.props b/build/DefaultConfiguration.props index 504b2637e..ba920928b 100644 --- a/build/DefaultConfiguration.props +++ b/build/DefaultConfiguration.props @@ -31,7 +31,7 @@ $Id$ --> - + diff --git a/build/PortableInstaller/PortableInstaller.vcxproj b/build/PortableInstaller/PortableInstaller.vcxproj index 23e6b5efb..f622e7aa2 100644 --- a/build/PortableInstaller/PortableInstaller.vcxproj +++ b/build/PortableInstaller/PortableInstaller.vcxproj @@ -1,5 +1,5 @@ - + {5B0E9978-E76F-4BBC-8194-228323F59B53} PortableInstaller diff --git a/build/PortableInstaller/PortableInstaller.vcxproj.filters b/build/PortableInstaller/PortableInstaller.vcxproj.filters index cf2d140a8..7b22a9201 100644 --- a/build/PortableInstaller/PortableInstaller.vcxproj.filters +++ b/build/PortableInstaller/PortableInstaller.vcxproj.filters @@ -1,5 +1,5 @@  - + {2c1914de-647f-44ab-a698-a289b10ec29c} diff --git a/build/aegisub.props b/build/aegisub.props index aa07badea..5a8705475 100644 --- a/build/aegisub.props +++ b/build/aegisub.props @@ -1,5 +1,5 @@ - + <_PropertySheetDisplayName>Aegisub project diff --git a/build/boost/boost.vcxproj b/build/boost/boost.vcxproj index fff93799e..0b9a4a1e7 100644 --- a/build/boost/boost.vcxproj +++ b/build/boost/boost.vcxproj @@ -1,5 +1,5 @@ - + {A649D828-A399-4D81-ADEF-94CFDBA7847F} boost diff --git a/build/boost/boost.vcxproj.filters b/build/boost/boost.vcxproj.filters index 07cced6a6..46b896a51 100644 --- a/build/boost/boost.vcxproj.filters +++ b/build/boost/boost.vcxproj.filters @@ -1,5 +1,5 @@ - + {e091980d-4374-41b8-aa61-1b07695e1b17} diff --git a/build/csrihelper/csrihelper.vcxproj b/build/csrihelper/csrihelper.vcxproj index c4115f23b..75dde4e94 100644 --- a/build/csrihelper/csrihelper.vcxproj +++ b/build/csrihelper/csrihelper.vcxproj @@ -1,5 +1,5 @@ - + {C832EAF3-860D-4373-A02C-933626B47A5E} diff --git a/build/csrihelper/csrihelper.vcxproj.filters b/build/csrihelper/csrihelper.vcxproj.filters index 0dd2ca51c..1e02f1701 100644 --- a/build/csrihelper/csrihelper.vcxproj.filters +++ b/build/csrihelper/csrihelper.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/expat/expat.vcxproj b/build/expat/expat.vcxproj index 399d6ec12..f0b86ebaf 100644 --- a/build/expat/expat.vcxproj +++ b/build/expat/expat.vcxproj @@ -1,5 +1,5 @@ - + {D6BA6815-0AAC-48FA-8372-D32CDE8BF07A} expat diff --git a/build/expat/expat.vcxproj.filters b/build/expat/expat.vcxproj.filters index 355924ee7..027046df1 100644 --- a/build/expat/expat.vcxproj.filters +++ b/build/expat/expat.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/ffmpeg/ffmpeg.vcxproj b/build/ffmpeg/ffmpeg.vcxproj index 6753294ee..cc3998fbe 100644 --- a/build/ffmpeg/ffmpeg.vcxproj +++ b/build/ffmpeg/ffmpeg.vcxproj @@ -1,5 +1,5 @@ - + {F934AB7B-186B-4E96-B20C-A58C38C1B819} ffmpeg diff --git a/build/ffmpeg/ffmpeg.vcxproj.filters b/build/ffmpeg/ffmpeg.vcxproj.filters index 25c259cfc..b0b75680f 100644 --- a/build/ffmpeg/ffmpeg.vcxproj.filters +++ b/build/ffmpeg/ffmpeg.vcxproj.filters @@ -1,5 +1,5 @@ - + libavdevice diff --git a/build/ffms2/ffms2.vcxproj b/build/ffms2/ffms2.vcxproj index a8dd49750..3d8ede152 100644 --- a/build/ffms2/ffms2.vcxproj +++ b/build/ffms2/ffms2.vcxproj @@ -1,5 +1,5 @@ - + {AA137613-96A1-4388-8905-71345B4F8F87} ffms2 diff --git a/build/ffms2/ffms2.vcxproj.filters b/build/ffms2/ffms2.vcxproj.filters index 6e948bff6..ea3a5106b 100644 --- a/build/ffms2/ffms2.vcxproj.filters +++ b/build/ffms2/ffms2.vcxproj.filters @@ -1,5 +1,5 @@ - + {ed366ac0-ef41-4c15-b40e-4db3c76b17db} diff --git a/build/fftw/fftw.vcxproj b/build/fftw/fftw.vcxproj index d33267b42..ac401ac82 100644 --- a/build/fftw/fftw.vcxproj +++ b/build/fftw/fftw.vcxproj @@ -1,5 +1,5 @@ - + {EA3DCC95-2423-4EA0-A508-7A427B4C0594} fftw diff --git a/build/fftw/fftw.vcxproj.filters b/build/fftw/fftw.vcxproj.filters index 94f248c47..475b35b82 100644 --- a/build/fftw/fftw.vcxproj.filters +++ b/build/fftw/fftw.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/freetype2/freetype.vcxproj b/build/freetype2/freetype.vcxproj index fdb8fbdf4..d3e30fa0d 100644 --- a/build/freetype2/freetype.vcxproj +++ b/build/freetype2/freetype.vcxproj @@ -1,5 +1,5 @@ - + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} freetype diff --git a/build/freetype2/freetype.vcxproj.filters b/build/freetype2/freetype.vcxproj.filters index 9787c9d06..d63b8c20f 100644 --- a/build/freetype2/freetype.vcxproj.filters +++ b/build/freetype2/freetype.vcxproj.filters @@ -1,5 +1,5 @@ - + {b4c15893-ec11-491d-9507-0ac184f9cc78} diff --git a/build/fribidi/fribidi.vcxproj b/build/fribidi/fribidi.vcxproj index 860a6767d..0f278d8b6 100644 --- a/build/fribidi/fribidi.vcxproj +++ b/build/fribidi/fribidi.vcxproj @@ -1,5 +1,5 @@ - + {FB8E8D19-A4D6-4181-943C-282075F49B41} fribidi diff --git a/build/fribidi/fribidi.vcxproj.filters b/build/fribidi/fribidi.vcxproj.filters index c9768c8a5..1d2dc123e 100644 --- a/build/fribidi/fribidi.vcxproj.filters +++ b/build/fribidi/fribidi.vcxproj.filters @@ -1,2 +1,2 @@ - + diff --git a/build/googletest/googletest.vcxproj b/build/googletest/googletest.vcxproj index ff7e14560..4924fa6c9 100644 --- a/build/googletest/googletest.vcxproj +++ b/build/googletest/googletest.vcxproj @@ -1,5 +1,5 @@ - + {FBE51B37-8B12-41E8-B5E0-F00A06B4BCD2} googletest diff --git a/build/googletest/googletest.vcxproj.filters b/build/googletest/googletest.vcxproj.filters index 883838a26..d4dec2fdd 100644 --- a/build/googletest/googletest.vcxproj.filters +++ b/build/googletest/googletest.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/hunspell/hunspell.vcxproj b/build/hunspell/hunspell.vcxproj index 0de22503f..ffced3cdb 100644 --- a/build/hunspell/hunspell.vcxproj +++ b/build/hunspell/hunspell.vcxproj @@ -1,5 +1,5 @@ - + {CC791693-6B28-40AC-879D-64A6C16468E3} hunspell diff --git a/build/hunspell/hunspell.vcxproj.filters b/build/hunspell/hunspell.vcxproj.filters index fdb464513..448ec67f3 100644 --- a/build/hunspell/hunspell.vcxproj.filters +++ b/build/hunspell/hunspell.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/icu/icu.vcxproj b/build/icu/icu.vcxproj index 602b7e3e9..94278c403 100644 --- a/build/icu/icu.vcxproj +++ b/build/icu/icu.vcxproj @@ -1,5 +1,5 @@  - + {F934AB7B-186B-4E96-B20C-A58C38C1B818} icu diff --git a/build/icu/icu.vcxproj.filters b/build/icu/icu.vcxproj.filters index d638dafec..a12c7f742 100644 --- a/build/icu/icu.vcxproj.filters +++ b/build/icu/icu.vcxproj.filters @@ -1,5 +1,5 @@ - + common diff --git a/build/install.targets b/build/install.targets index 818536fbb..c76c521dc 100644 --- a/build/install.targets +++ b/build/install.targets @@ -1,5 +1,5 @@ - + diff --git a/build/libaegisub/libaegisub.vcxproj b/build/libaegisub/libaegisub.vcxproj index a431eb5eb..8dfd3a7c9 100644 --- a/build/libaegisub/libaegisub.vcxproj +++ b/build/libaegisub/libaegisub.vcxproj @@ -1,5 +1,5 @@ - + {BB3FED86-DB7A-4DC7-964A-260FB86CDE61} libaegisub diff --git a/build/libaegisub/libaegisub.vcxproj.filters b/build/libaegisub/libaegisub.vcxproj.filters index 157c48198..bbed5b1e3 100644 --- a/build/libaegisub/libaegisub.vcxproj.filters +++ b/build/libaegisub/libaegisub.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/libass/libass.vcxproj b/build/libass/libass.vcxproj index cf21877c8..1659a33e9 100644 --- a/build/libass/libass.vcxproj +++ b/build/libass/libass.vcxproj @@ -1,5 +1,5 @@ - + {8804F253-DA67-4CC4-926B-0CD2AEE5778D} libass @@ -23,7 +23,7 @@ $(LibassSrcDir)\libass; $(MSBuildThisFileDirectory); - $(FribidiSrcDir)\fribidi; + $(FribidiSrcDir)\lib; %(AdditionalIncludeDirectories) diff --git a/build/libass/libass.vcxproj.filters b/build/libass/libass.vcxproj.filters index 9623c769c..dc4525be4 100644 --- a/build/libass/libass.vcxproj.filters +++ b/build/libass/libass.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/libiconv/libiconv.vcxproj b/build/libiconv/libiconv.vcxproj index 712551531..948c4720c 100644 --- a/build/libiconv/libiconv.vcxproj +++ b/build/libiconv/libiconv.vcxproj @@ -1,5 +1,5 @@ - + {965054D2-44F2-4EB2-9879-051CC3D7EF08} libiconv diff --git a/build/libiconv/libiconv.vcxproj.filters b/build/libiconv/libiconv.vcxproj.filters index 4e4a8972b..607789256 100644 --- a/build/libiconv/libiconv.vcxproj.filters +++ b/build/libiconv/libiconv.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/libpng/libpng.vcxproj b/build/libpng/libpng.vcxproj index 9d57ff478..85910c036 100644 --- a/build/libpng/libpng.vcxproj +++ b/build/libpng/libpng.vcxproj @@ -1,5 +1,5 @@ - + {5CABCBEF-E79A-4D27-94A5-CF4EAAF1DD96} libpng diff --git a/build/libpng/libpng.vcxproj.filters b/build/libpng/libpng.vcxproj.filters index 355924ee7..027046df1 100644 --- a/build/libpng/libpng.vcxproj.filters +++ b/build/libpng/libpng.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/libresrc/libresrc.vcxproj b/build/libresrc/libresrc.vcxproj index 5a5fafee1..c9691be1d 100644 --- a/build/libresrc/libresrc.vcxproj +++ b/build/libresrc/libresrc.vcxproj @@ -1,5 +1,5 @@ - + {BD00D65F-24DA-4784-8860-3B972EA125FC} libresrc diff --git a/build/libresrc/libresrc.vcxproj.filters b/build/libresrc/libresrc.vcxproj.filters index 9cedcca48..2d75155f0 100644 --- a/build/libresrc/libresrc.vcxproj.filters +++ b/build/libresrc/libresrc.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/luabins/luabins.vcxproj b/build/luabins/luabins.vcxproj index ef162ac35..bf4a42a79 100644 --- a/build/luabins/luabins.vcxproj +++ b/build/luabins/luabins.vcxproj @@ -1,5 +1,5 @@ - + {A7A30702-8162-4E1A-A010-EF51B590C121} luabins diff --git a/build/luabins/luabins.vcxproj.filters b/build/luabins/luabins.vcxproj.filters index 67677205b..94d4ebfe4 100644 --- a/build/luabins/luabins.vcxproj.filters +++ b/build/luabins/luabins.vcxproj.filters @@ -1,5 +1,5 @@ - + {0A33FF05-970D-49a7-B722-73E8EA350084} diff --git a/build/luajit-buildvm/luajit-buildvm.vcxproj b/build/luajit-buildvm/luajit-buildvm.vcxproj index 3132e2ab4..adac80acd 100644 --- a/build/luajit-buildvm/luajit-buildvm.vcxproj +++ b/build/luajit-buildvm/luajit-buildvm.vcxproj @@ -1,5 +1,5 @@ - + {7CA6A4EB-A11B-4975-8F3A-F633111C6213} luajitbuildvm diff --git a/build/luajit-buildvm/luajit-buildvm.vcxproj.filters b/build/luajit-buildvm/luajit-buildvm.vcxproj.filters index e9cb57b99..027d00967 100644 --- a/build/luajit-buildvm/luajit-buildvm.vcxproj.filters +++ b/build/luajit-buildvm/luajit-buildvm.vcxproj.filters @@ -1,5 +1,5 @@ - + diff --git a/build/luajit-minilua/luajit-minilua.vcxproj b/build/luajit-minilua/luajit-minilua.vcxproj index f27dbca75..3546ee44f 100644 --- a/build/luajit-minilua/luajit-minilua.vcxproj +++ b/build/luajit-minilua/luajit-minilua.vcxproj @@ -1,5 +1,5 @@ - + {FCAED410-90EF-4EF9-916C-4B86DC13A3CF} luajitminilua diff --git a/build/luajit-minilua/luajit-minilua.vcxproj.filters b/build/luajit-minilua/luajit-minilua.vcxproj.filters index 5243cbd1d..f94eb597d 100644 --- a/build/luajit-minilua/luajit-minilua.vcxproj.filters +++ b/build/luajit-minilua/luajit-minilua.vcxproj.filters @@ -1,5 +1,5 @@ - + diff --git a/build/luajit/luajit.vcxproj b/build/luajit/luajit.vcxproj index 58a34500d..c54fe0e64 100644 --- a/build/luajit/luajit.vcxproj +++ b/build/luajit/luajit.vcxproj @@ -1,5 +1,5 @@ - + {5391A8B1-9C70-4DC4-92AD-D3E34C6B803F} luajit diff --git a/build/luajit/luajit.vcxproj.filters b/build/luajit/luajit.vcxproj.filters index 59e9479a1..7d4f045fb 100644 --- a/build/luajit/luajit.vcxproj.filters +++ b/build/luajit/luajit.vcxproj.filters @@ -1,5 +1,5 @@ - + {dfbe0704-0805-42a9-b221-0eb02d38e473} diff --git a/build/paths.props b/build/paths.props index cc6e5d677..60ce7a2ba 100644 --- a/build/paths.props +++ b/build/paths.props @@ -1,5 +1,5 @@ - + <_PropertySheetDisplayName>Path definitions diff --git a/build/respack.targets b/build/respack.targets index 5d8cf0194..a53737676 100644 --- a/build/respack.targets +++ b/build/respack.targets @@ -1,5 +1,5 @@ - + $(AegisubBinaryDir)luajit-minilua$(AegisubPlatformSuffix) $(AegisubSourceBase)tools\respack.lua diff --git a/build/scintilla/scintilla.vcxproj b/build/scintilla/scintilla.vcxproj index 70c1b6e27..17a6c0d01 100644 --- a/build/scintilla/scintilla.vcxproj +++ b/build/scintilla/scintilla.vcxproj @@ -1,5 +1,5 @@ - + {D6EA54FD-F15C-42F6-929B-A83F299A4582} scintilla diff --git a/build/scintilla/scintilla.vcxproj.filters b/build/scintilla/scintilla.vcxproj.filters index 355924ee7..027046df1 100644 --- a/build/scintilla/scintilla.vcxproj.filters +++ b/build/scintilla/scintilla.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/standard-outdirs.props b/build/standard-outdirs.props index ba4f2b275..e82cded6c 100644 --- a/build/standard-outdirs.props +++ b/build/standard-outdirs.props @@ -1,5 +1,5 @@ - + <_PropertySheetDisplayName>Output directories diff --git a/build/standard-settings.props b/build/standard-settings.props index bdd8e7ac6..c892f88bd 100644 --- a/build/standard-settings.props +++ b/build/standard-settings.props @@ -1,5 +1,5 @@ - + <_PropertySheetDisplayName>Compiler settings diff --git a/build/tasks.props b/build/tasks.props index 39c594f90..5f71c998d 100644 --- a/build/tasks.props +++ b/build/tasks.props @@ -1,5 +1,5 @@ - + <_PropertySheetDisplayName>Custom Tasks diff --git a/build/tests/tests.vcxproj b/build/tests/tests.vcxproj index 1dbbfb1af..cdc2bef33 100644 --- a/build/tests/tests.vcxproj +++ b/build/tests/tests.vcxproj @@ -1,5 +1,5 @@ - + {49766286-2B5D-4177-A860-BD7CE1846EEF} tests diff --git a/build/tests/tests.vcxproj.filters b/build/tests/tests.vcxproj.filters index dceeba91b..db5329981 100644 --- a/build/tests/tests.vcxproj.filters +++ b/build/tests/tests.vcxproj.filters @@ -1,5 +1,5 @@ - + {93995380-89BD-4b04-88EB-625FBE52EBFB} diff --git a/build/universalchardet/universalchardet.vcxproj b/build/universalchardet/universalchardet.vcxproj index 4479436d2..4e6d6250a 100644 --- a/build/universalchardet/universalchardet.vcxproj +++ b/build/universalchardet/universalchardet.vcxproj @@ -1,5 +1,5 @@  - + {7B56955D-5162-4698-AA5B-47484EDC8783} universalchardet diff --git a/build/universalchardet/universalchardet.vcxproj.filters b/build/universalchardet/universalchardet.vcxproj.filters index a3b82a996..b8276f053 100644 --- a/build/universalchardet/universalchardet.vcxproj.filters +++ b/build/universalchardet/universalchardet.vcxproj.filters @@ -1,5 +1,5 @@ - + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} diff --git a/build/userconfig/ft2.props.sample b/build/userconfig/ft2.props.sample index 926813596..52cfe9f05 100644 --- a/build/userconfig/ft2.props.sample +++ b/build/userconfig/ft2.props.sample @@ -1,5 +1,5 @@ - +