Commit 5b373cdd authored by mercury233's avatar mercury233

update ci

parent 0f53b60a
bin/
build/
event/
freetype/
irrlicht/
lua/
obj/
sqlite3/
deck/
replay/
premake4.exe
/bin/
/build/
/event/
/freetype/
/gframe/ygopro.ico
/gframe/ygopro.rc
/gframe/ygopro.aps
/irrlicht/
/lua/
/obj/
/sqlite3/
premake5.exe
cards.cdb
ygopro.exe
gframe/ygopro.aps
[submodule "ocgcore"]
path = ocgcore
url = git@github.com:Fluorohydride/ygopro-core.git
url = https://github.com/Fluorohydride/ygopro-core
[submodule "script"]
path = script
url = git@github.com:Fluorohydride/ygopro-scripts.git
url = https://github.com/Fluorohydride/ygopro-scripts
......@@ -20,8 +20,6 @@ addons:
- libgl1-mesa-dev
- libglu-dev
before_install:
- openssl aes-256-cbc -K $encrypted_c268b785a48e_key -iv $encrypted_c268b785a48e_iv -in ssh-key.enc -out $HOME/.ssh/id_ecdsa -d
- chmod 600 $HOME/.ssh/id_ecdsa
- git submodule update --init --recursive
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install freetype libevent sqlite irrlicht lua dylibbundler; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha9/premake-5.0.0-alpha9-macosx.tar.gz | tar zfx -; fi
......
environment:
priv_key:
secure: ek1AH0N8/KF6VoildmkHnu4TY1yBZcptm20AesAOanRSSGLFqkXeRxL80mHSXtiVY8ggtQNsEQR4M69gCiw1OPVWz4OAN6Vg6id6kho9GqYxWCdADbmffSNPB5leksRGjGmkAF99WHiOIZrLRUb6Bia91Fe5+SngPhI01GDDUZA2urv9x50uBBhc+kvV0bv7J5TeXDGr7tfZ3J2aL/3tf/WPqBkqjWlGAj99HTWpkIiQgwaBHoyBvEFD0uHa1BdSmI7PySGabbx4/4zqyGkO38Ce7t/Ntu/dgedzVxlXYfuiXDI8caAPZSVsJ9E2S3VKesZJzHtV9KM/8Xq0RFPythdC/qTvd2e3IAZGudZpgbUHGAHLJnCzn189Zm+Qle8CbbVuPNDcf1B/G/XwEU2MsDXGkF/kFxdeqbHgjzneyns=
version: '{build}'
install:
# ssh key and submodules
- ps: $fileContent = "-----BEGIN EC PRIVATE KEY-----`n"
- ps: $fileContent += $env:priv_key.Replace(' ', "`n")
- ps: $fileContent += "`n-----END EC PRIVATE KEY-----`n"
- ps: Set-Content c:\users\appveyor\.ssh\id_ecdsa $fileContent
# submodules
- git submodule update --init --recursive
# environment and system dependency
- ps: Start-FileDownload https://github.com/premake/premake-core/releases/download/v5.0.0-alpha9/premake-5.0.0-alpha9-windows.zip
- appveyor DownloadFile https://github.com/premake/premake-core/releases/download/v5.0.0-alpha9/premake-5.0.0-alpha9-windows.zip
- 7z x premake-5.0.0-alpha9-windows.zip
- ps: Start-FileDownload http://downloads.sourceforge.net/project/freetype/freetype2/2.5.5/freetype-2.5.5.tar.bz2
- tar xf freetype-2.5.5.tar.bz2
- move freetype-2.5.5 freetype
- appveyor DownloadFile https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz
- tar xf libevent-2.0.22-stable.tar.gz
- move libevent-2.0.22-stable event
- xcopy /E event\WIN32-Code event\include
- ps: Start-FileDownload http://downloads.sourceforge.net/project/irrlicht/Irrlicht%20SDK/1.8/1.8.4/irrlicht-1.8.4.zip
- appveyor DownloadFile http://downloads.sourceforge.net/freetype/freetype-2.7.tar.bz2
- tar xf freetype-2.7.tar.bz2
- move freetype-2.7 freetype
- appveyor DownloadFile http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.4.zip
- 7z x irrlicht-1.8.4.zip
- md irrlicht
- move irrlicht-1.8.4\source\Irrlicht irrlicht\src
- move irrlicht-1.8.4\include irrlicht\include
- patch -p0 < irrlicht.patch
- patch -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
- tar xf libevent-2.0.22-stable.tar.gz
- move libevent-2.0.22-stable event
- xcopy /E event\WIN32-Code event\include
- ps: Start-FileDownload https://www.lua.org/ftp/lua-5.2.4.tar.gz
- appveyor DownloadFile https://www.lua.org/ftp/lua-5.2.4.tar.gz
- tar xf lua-5.2.4.tar.gz
- move lua-5.2.4\src lua
- ps: Start-FileDownload https://sqlite.org/2016/sqlite-amalgamation-3140100.zip
- 7z x sqlite-amalgamation-3140100.zip
- move sqlite-amalgamation-3140100 sqlite3
- appveyor DownloadFile https://www.sqlite.org/2016/sqlite-amalgamation-3140200.zip
- 7z x sqlite-amalgamation-3140200.zip
- move sqlite-amalgamation-3140200 sqlite3
# let premake happy
- move event.premake4.lua event/premake4.lua
- move freetype.premake4.lua freetype/premake4.lua
- move irrlicht.premake4.lua irrlicht/premake4.lua
- move lua.premake4.lua lua/premake4.lua
- move sqlite3.premake4.lua sqlite3/premake4.lua
- xcopy /E premake\* .
# patch irrlicht
- patch -p0 < irrlicht\irrlicht.patch
# premake
- premake5 vs2015
......
project "event"
kind "StaticLib"
includedirs { "include", "." }
files {"event.c", "buffer.c", "bufferevent.c", "bufferevent_sock.c", "bufferevent_pair.c",
"listener.c", "evmap.c", "log.c", "evutil.c", "strlcpy.c", "signal.c", "bufferevent_filter.c",
"evthread.c", "bufferevent_ratelim.c", "evutil_rand.c" }
files {"event_tagging.c", "http.c", "evdns.c", "evrpc.c"}
configuration "windows"
files {"win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c"}
includedirs { "compat" }
project "freetype"
kind "StaticLib"
includedirs { "include" }
defines { "FT2_BUILD_LIBRARY" }
files { "src/autofit/autofit.c", "src/bdf/bdf.c", "src/cff/cff.c", "src/base/ftbase.c",
"src/cache/ftcache.c", "src/base/ftbitmap.c", "src/base/ftdebug.c", "src/base/ftfstype.c",
"src/base/ftbbox.c", "src/base/ftgxval.c", "src/base/ftlcdfil.c", "src/base/ftmm.c",
"src/base/ftotval.c", "src/base/ftpatent.c", "src/base/ftpfr.c", "src/base/ftsynth.c",
"src/base/fttype1.c", "src/base/ftxf86.c", "src/base/ftgasp.c", "src/base/ftglyph.c",
"src/base/ftinit.c", "src/base/ftstroke.c", "src/base/ftsystem.c", "src/smooth/smooth.c",
"src/lzw/ftlzw.c", "src/gzip/ftgzip.c", "src/pcf/pcf.c", "src/pfr/pfr.c", "src/psaux/psaux.c",
"src/pshinter/pshinter.c", "src/psnames/psmodule.c", "src/raster/raster.c", "src/sfnt/sfnt.c",
"src/truetype/truetype.c", "src/type1/type1.c", "src/cid/type1cid.c", "src/type42/type42.c",
"src/winfonts/winfnt.c" }
configuration { "Debug" }
defines { "FT_DEBUG_LEVEL_ERROR", "FT_DEBUG_LEVEL_TRACE" }
This diff is collapsed.
project "event"
kind "StaticLib"
includedirs { "include", "compat" }
files { "event.c", "evthread.c", "buffer.c", "bufferevent.c", "bufferevent_sock.c",
"bufferevent_filter.c", "bufferevent_pair.c", "listener.c", "bufferevent_ratelim.c",
"evmap.c", "log.c", "evutil.c", "evutil_rand.c", "strlcpy.c", "signal.c",
"event_tagging.c", "http.c", "evdns.c", "evrpc.c" }
configuration "windows"
files { "win32select.c", "evthread_win32.c", "buffer_iocp.c", "event_iocp.c", "bufferevent_async.c" }
project "freetype"
kind "StaticLib"
includedirs { "include" }
defines { "FT2_BUILD_LIBRARY" }
files { "src/autofit/autofit.c", "src/bdf/bdf.c", "src/cff/cff.c", "src/base/ftbase.c",
"src/base/ftbitmap.c", "src/cache/ftcache.c", "src/base/ftfstype.c", "src/base/ftgasp.c",
"src/base/ftglyph.c", "src/gzip/ftgzip.c", "src/base/ftinit.c", "src/lzw/ftlzw.c",
"src/base/ftstroke.c", "src/base/ftsystem.c", "src/smooth/smooth.c", "src/base/ftbbox.c",
"src/base/ftfntfmt.c", "src/base/ftmm.c", "src/base/ftpfr.c", "src/base/ftsynth.c",
"src/base/fttype1.c", "src/base/ftwinfnt.c", "src/base/ftlcdfil.c", "src/base/ftgxval.c",
"src/base/ftotval.c", "src/base/ftpatent.c", "src/pcf/pcf.c", "src/pfr/pfr.c",
"src/psaux/psaux.c", "src/pshinter/pshinter.c", "src/psnames/psmodule.c",
"src/raster/raster.c", "src/sfnt/sfnt.c", "src/truetype/truetype.c",
"src/type1/type1.c", "src/cid/type1cid.c", "src/type42/type42.c", "src/winfonts/winfnt.c" }
configuration "windows"
files { "builds/windows/ftdebug.c" }
1 ICON "ygopro.ico"
1 VERSIONINFO
FILEVERSION 1, 0, 33, 11
PRODUCTVERSION 1, 0, 33, 11
......@@ -13,7 +11,7 @@ BLOCK "StringFileInfo"
BEGIN
BLOCK "080404b0"
BEGIN
VALUE "FileDescription", "YGOPRO"
VALUE "FileDescription", "YGOPRO ver.mycard"
VALUE "InternalName", "YGOPRO"
VALUE "LegalCopyright", "Copyright (C) 2016 Fluorohydride"
VALUE "OriginalFilename", "ygopro.exe"
......
diff -ur --strip-trailing-cr irrlicht/include/IOSOperator.h ../ygopro-build/irrlicht/include/IOSOperator.h
diff -ur --strip-trailing-cr irrlicht/include/IOSOperator.h irrlicht-fixed/include/IOSOperator.h
--- irrlicht/include/IOSOperator.h 2012-11-03 10:08:34.000000000 +0000
+++ ../ygopro-build/irrlicht/include/IOSOperator.h 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/include/IOSOperator.h 2015-06-14 17:32:58.000000000 +0000
@@ -26,11 +26,11 @@
}
......@@ -15,9 +15,9 @@ diff -ur --strip-trailing-cr irrlicht/include/IOSOperator.h ../ygopro-build/irrl
//! Get the processor speed in megahertz
/** \param MHz The integer variable to store the speed in.
diff -ur --strip-trailing-cr irrlicht/include/irrTypes.h ../ygopro-build/irrlicht/include/irrTypes.h
diff -ur --strip-trailing-cr irrlicht/include/irrTypes.h irrlicht-fixed/include/irrTypes.h
--- irrlicht/include/irrTypes.h 2012-11-03 10:08:34.000000000 +0000
+++ ../ygopro-build/irrlicht/include/irrTypes.h 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/include/irrTypes.h 2015-06-14 17:32:58.000000000 +0000
@@ -48,7 +48,9 @@
typedef signed short s16;
#endif
......@@ -29,9 +29,9 @@ diff -ur --strip-trailing-cr irrlicht/include/irrTypes.h ../ygopro-build/irrlich
//! 32 bit unsigned variable.
/** This is a typedef for unsigned int, it ensures portability of the engine. */
diff -ur --strip-trailing-cr irrlicht/include/Keycodes.h ../ygopro-build/irrlicht/include/Keycodes.h
diff -ur --strip-trailing-cr irrlicht/include/Keycodes.h irrlicht-fixed/include/Keycodes.h
--- irrlicht/include/Keycodes.h 2012-11-03 10:08:32.000000000 +0000
+++ ../ygopro-build/irrlicht/include/Keycodes.h 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/include/Keycodes.h 2015-06-14 17:32:58.000000000 +0000
@@ -89,7 +89,7 @@
KEY_KEY_X = 0x58, // X key
KEY_KEY_Y = 0x59, // Y key
......@@ -41,9 +41,9 @@ diff -ur --strip-trailing-cr irrlicht/include/Keycodes.h ../ygopro-build/irrlich
KEY_RWIN = 0x5C, // Right Windows key (Natural keyboard)
KEY_APPS = 0x5D, // Applications key (Natural keyboard)
KEY_SLEEP = 0x5F, // Computer Sleep key
diff -ur --strip-trailing-cr irrlicht/src/CD3D9ShaderMaterialRenderer.cpp ../ygopro-build/irrlicht/src/CD3D9ShaderMaterialRenderer.cpp
diff -ur --strip-trailing-cr irrlicht/src/CD3D9ShaderMaterialRenderer.cpp irrlicht-fixed/src/CD3D9ShaderMaterialRenderer.cpp
--- irrlicht/src/CD3D9ShaderMaterialRenderer.cpp 2012-11-03 10:08:10.000000000 +0000
+++ ../ygopro-build/irrlicht/src/CD3D9ShaderMaterialRenderer.cpp 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/src/CD3D9ShaderMaterialRenderer.cpp 2015-06-14 17:32:58.000000000 +0000
@@ -329,7 +329,7 @@
strDllName += (int)D3DX_SDK_VERSION;
strDllName += ".dll";
......@@ -80,9 +80,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CD3D9ShaderMaterialRenderer.cpp ../ygo
if (hMod)
pFn = (D3DXCompileShaderFromFileFunction)GetProcAddress(hMod, "D3DXCompileShaderFromFileA");
diff -ur --strip-trailing-cr irrlicht/src/CGUIEditBox.cpp ../ygopro-build/irrlicht/src/CGUIEditBox.cpp
diff -ur --strip-trailing-cr irrlicht/src/CGUIEditBox.cpp irrlicht-fixed/src/CGUIEditBox.cpp
--- irrlicht/src/CGUIEditBox.cpp 2012-11-03 10:08:16.000000000 +0000
+++ ../ygopro-build/irrlicht/src/CGUIEditBox.cpp 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/src/CGUIEditBox.cpp 2015-06-14 17:32:58.000000000 +0000
@@ -286,7 +286,7 @@
const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
......@@ -110,9 +110,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CGUIEditBox.cpp ../ygopro-build/irrlic
if (p)
{
if (MarkBegin == MarkEnd)
diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.cpp ../ygopro-build/irrlicht/src/CIrrDeviceWin32.cpp
diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.cpp irrlicht-fixed/src/CIrrDeviceWin32.cpp
--- irrlicht/src/CIrrDeviceWin32.cpp 2012-11-05 07:14:12.000000000 +0000
+++ ../ygopro-build/irrlicht/src/CIrrDeviceWin32.cpp 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/src/CIrrDeviceWin32.cpp 2015-06-14 17:32:58.000000000 +0000
@@ -16,14 +16,16 @@
#include "COSOperator.h"
#include "dimension2d.h"
......@@ -382,9 +382,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.cpp ../ygopro-build/ir
}
}
}
diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.h ../ygopro-build/irrlicht/src/CIrrDeviceWin32.h
diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.h irrlicht-fixed/src/CIrrDeviceWin32.h
--- irrlicht/src/CIrrDeviceWin32.h 2012-11-05 07:14:12.000000000 +0000
+++ ../ygopro-build/irrlicht/src/CIrrDeviceWin32.h 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/src/CIrrDeviceWin32.h 2015-06-14 17:32:58.000000000 +0000
@@ -395,7 +395,7 @@
bool Resized;
bool ExternalWindow;
......@@ -394,9 +394,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.h ../ygopro-build/irrl
SJoystickWin32Control* JoyControl;
};
diff -ur --strip-trailing-cr irrlicht/src/COpenGLDriver.cpp ../ygopro-build/irrlicht/src/COpenGLDriver.cpp
diff -ur --strip-trailing-cr irrlicht/src/COpenGLDriver.cpp irrlicht-fixed/src/COpenGLDriver.cpp
--- irrlicht/src/COpenGLDriver.cpp 2012-11-03 10:08:08.000000000 +0000
+++ ../ygopro-build/irrlicht/src/COpenGLDriver.cpp 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/src/COpenGLDriver.cpp 2015-06-14 17:32:58.000000000 +0000
@@ -85,11 +85,11 @@
bool COpenGLDriver::initDriver(CIrrDeviceWin32* device)
{
......@@ -472,9 +472,9 @@ diff -ur --strip-trailing-cr irrlicht/src/COpenGLDriver.cpp ../ygopro-build/irrl
// get hdc
HDc=GetDC(Window);
diff -ur --strip-trailing-cr irrlicht/src/COSOperator.cpp ../ygopro-build/irrlicht/src/COSOperator.cpp
diff -ur --strip-trailing-cr irrlicht/src/COSOperator.cpp irrlicht-fixed/src/COSOperator.cpp
--- irrlicht/src/COSOperator.cpp 2012-11-03 10:07:52.000000000 +0000
+++ ../ygopro-build/irrlicht/src/COSOperator.cpp 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/src/COSOperator.cpp 2015-06-14 17:32:58.000000000 +0000
@@ -52,11 +52,8 @@
......@@ -543,9 +543,9 @@ diff -ur --strip-trailing-cr irrlicht/src/COSOperator.cpp ../ygopro-build/irrlic
GlobalUnlock( hData );
CloseClipboard();
return buffer;
diff -ur --strip-trailing-cr irrlicht/src/COSOperator.h ../ygopro-build/irrlicht/src/COSOperator.h
diff -ur --strip-trailing-cr irrlicht/src/COSOperator.h irrlicht-fixed/src/COSOperator.h
--- irrlicht/src/COSOperator.h 2012-11-03 10:08:00.000000000 +0000
+++ ../ygopro-build/irrlicht/src/COSOperator.h 2015-06-14 17:32:58.000000000 +0000
+++ irrlicht-fixed/src/COSOperator.h 2015-06-14 17:32:58.000000000 +0000
@@ -27,11 +27,11 @@
virtual const core::stringc& getOperatingSystemVersion() const;
......@@ -560,3 +560,21 @@ diff -ur --strip-trailing-cr irrlicht/src/COSOperator.h ../ygopro-build/irrlicht
//! gets the processor speed in megahertz
//! \param Mhz:
diff -ur --strip-trailing-cr irrlicht/src/CGUIEditBox.cpp irrlicht-fixed/src/CGUIEditBox.cpp
--- irrlicht/src/CGUIEditBox.cpp 2016-09-15 18:12:49.532839000 +0000
+++ irrlicht-fixed/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)
{
This diff is collapsed.
project "lua"
kind "StaticLib"
files { "**.cc", "**.cpp", "**.c", "**.h" }
files { "*.c", "*.h" }
solution "ygo"
location "build"
language "C++"
objdir "obj"
configurations { "Release", "Debug" }
configuration "Release"
flags { "OptimizeSpeed" }
targetdir "bin/release"
configuration "Debug"
flags "Symbols"
defines "_DEBUG"
targetdir "bin/debug"
configuration { "Release", "vs*" }
flags { "StaticRuntime", "LinkTimeOptimization" }
disablewarnings { "4244", "4267", "4838", "4577", "4819", "4018", "4996", "4477" }
configuration { "Debug", "vs*" }
defines { "_ITERATOR_DEBUG_LEVEL=0" }
configuration "vs*"
flags "EnableSSE2"
defines { "WIN32", "_WIN32", "WINVER=0x0501", "_CRT_SECURE_NO_WARNINGS" }
startproject "ygopro"
include "ocgcore"
include "gframe"
include "event"
include "freetype"
include "irrlicht"
include "lua"
include "sqlite3"
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