Skip to content

Y
ygopro
Commit 55a65087 authored by mercury233's avatar mercury233
Browse files
Options

appveyor 

test irrlicht 1.8.4
parent 82fc96b6
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 4 deletions
appveyor.yml
View file @ 55a65087
...@@ -18,17 +18,18 @@ install: ...@@ -18,17 +18,18 @@ install:
- 7z x freetype-2.5.5.tar.bz2 && 7z x freetype-2.5.5.tar - 7z x freetype-2.5.5.tar.bz2 && 7z x freetype-2.5.5.tar
- move freetype-2.5.5 freetype - move freetype-2.5.5 freetype
- ps: Start-FileDownload http://sourceforge.mirrorservice.org/i/ir/irrlicht/Irrlicht%20SDK/1.8/irrlicht-1.8.zip - ps: Start-FileDownload http://sourceforge.mirrorservice.org/i/ir/irrlicht/Irrlicht%20SDK/1.8/1.8.4/irrlicht-1.8.4.zip
- 7z x irrlicht-1.8.zip - 7z x irrlicht-1.8.4.zip
- md irrlicht - md irrlicht
- move irrlicht-1.8\source\Irrlicht irrlicht\src - move irrlicht-1.8.4\source\Irrlicht irrlicht\src
- move irrlicht-1.8\include irrlicht\include - move irrlicht-1.8.4\include irrlicht\include
# download MSYS2 to apply patch # download MSYS2 to apply patch
- ps: Start-FileDownload http://downloads.sourceforge.net/project/msys2/REPOS/MSYS2/x86_64/msys2-runtime-2.0.16627.db76629-1-x86_64.pkg.tar.xz - ps: Start-FileDownload http://downloads.sourceforge.net/project/msys2/REPOS/MSYS2/x86_64/msys2-runtime-2.0.16627.db76629-1-x86_64.pkg.tar.xz
- ps: Start-FileDownload http://downloads.sourceforge.net/project/msys2/REPOS/MSYS2/x86_64/patch-2.7.5-1-x86_64.pkg.tar.xz - ps: Start-FileDownload http://downloads.sourceforge.net/project/msys2/REPOS/MSYS2/x86_64/patch-2.7.5-1-x86_64.pkg.tar.xz
- 7z x msys2-runtime-2.0.16627.db76629-1-x86_64.pkg.tar.xz && 7z x msys2-runtime-2.0.16627.db76629-1-x86_64.pkg.tar - 7z x msys2-runtime-2.0.16627.db76629-1-x86_64.pkg.tar.xz && 7z x msys2-runtime-2.0.16627.db76629-1-x86_64.pkg.tar
- 7z x patch-2.7.5-1-x86_64.pkg.tar.xz && 7z x -y patch-2.7.5-1-x86_64.pkg.tar - 7z x patch-2.7.5-1-x86_64.pkg.tar.xz && 7z x -y patch-2.7.5-1-x86_64.pkg.tar
- usr\bin\patch.exe -p0 < irrlicht.patch - usr\bin\patch.exe -p0 < irrlicht.patch
- usr\bin\patch.exe -p0 < test.patch
- ps: Start-FileDownload https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz - ps: Start-FileDownload https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz
- 7z x libevent-2.0.22-stable.tar.gz && 7z x libevent-2.0.22-stable.tar - 7z x libevent-2.0.22-stable.tar.gz && 7z x libevent-2.0.22-stable.tar
......
test.patch 0 → 100644
View file @ 55a65087
diff -ur --strip-trailing-cr irrlicht/src-old/CGUIEditBox.cpp irrlicht/src/CGUIEditBox.cpp
--- irrlicht/src-old/CGUIEditBox.cpp 2016-09-15 18:12:49.532839000 +0000
+++ irrlicht/src/CGUIEditBox.cpp 2016-09-15 18:13:37.101559800 +0000
@@ -333,13 +333,7 @@
const c16* p = Operator->getTextFromClipboard();
if (p)
{
- // TODO: we should have such a function in core::string
- size_t lenOld = strlen(p);
- wchar_t *ws = new wchar_t[lenOld + 1];
- size_t len = mbstowcs(ws,p,lenOld);
- ws[len] = 0;
- irr::core::stringw widep(ws);
- delete[] ws;
+ irr::core::stringw widep(p);
if (MarkBegin == MarkEnd)
{
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment