Skip to content

Y
ygopro
Commit 5b373cdd authored by mercury233's avatar mercury233
Browse files
Options

update ci

parent 0f53b60a
Show whitespace changes
Inline Side-by-side
Showing with 470 additions and 135 deletions
.gitignore
View file @ 5b373cdd
bin/ /bin/
build/ /build/
event/ /event/
freetype/ /freetype/
irrlicht/ /gframe/ygopro.ico
lua/ /gframe/ygopro.rc
obj/ /gframe/ygopro.aps
sqlite3/ /irrlicht/
deck/ /lua/
replay/ /obj/
premake4.exe /sqlite3/
premake5.exe premake5.exe
cards.cdb
ygopro.exe
gframe/ygopro.aps
.gitmodules
View file @ 5b373cdd
[submodule "ocgcore"] [submodule "ocgcore"]
path = ocgcore path = ocgcore
url = git@github.com:Fluorohydride/ygopro-core.git url = https://github.com/Fluorohydride/ygopro-core
[submodule "script"] [submodule "script"]
path = script path = script
url = git@github.com:Fluorohydride/ygopro-scripts.git url = https://github.com/Fluorohydride/ygopro-scripts
.travis.yml
View file @ 5b373cdd
...@@ -20,8 +20,6 @@ addons: ...@@ -20,8 +20,6 @@ addons:
- libgl1-mesa-dev - libgl1-mesa-dev
- libglu-dev - libglu-dev
before_install: 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 - 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 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 - 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
......
appveyor.yml
View file @ 5b373cdd
environment:
priv_key:
secure: ek1AH0N8/KF6VoildmkHnu4TY1yBZcptm20AesAOanRSSGLFqkXeRxL80mHSXtiVY8ggtQNsEQR4M69gCiw1OPVWz4OAN6Vg6id6kho9GqYxWCdADbmffSNPB5leksRGjGmkAF99WHiOIZrLRUb6Bia91Fe5+SngPhI01GDDUZA2urv9x50uBBhc+kvV0bv7J5TeXDGr7tfZ3J2aL/3tf/WPqBkqjWlGAj99HTWpkIiQgwaBHoyBvEFD0uHa1BdSmI7PySGabbx4/4zqyGkO38Ce7t/Ntu/dgedzVxlXYfuiXDI8caAPZSVsJ9E2S3VKesZJzHtV9KM/8Xq0RFPythdC/qTvd2e3IAZGudZpgbUHGAHLJnCzn189Zm+Qle8CbbVuPNDcf1B/G/XwEU2MsDXGkF/kFxdeqbHgjzneyns=
version: '{build}' version: '{build}'
install: install:
# ssh key and submodules # 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
- git submodule update --init --recursive - git submodule update --init --recursive
# environment and system dependency # 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 - 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 - appveyor DownloadFile https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz
- tar xf freetype-2.5.5.tar.bz2 - tar xf libevent-2.0.22-stable.tar.gz
- move freetype-2.5.5 freetype - 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 - 7z x irrlicht-1.8.4.zip
- md irrlicht - md irrlicht
- move irrlicht-1.8.4\source\Irrlicht irrlicht\src - move irrlicht-1.8.4\source\Irrlicht irrlicht\src
- move irrlicht-1.8.4\include irrlicht\include - 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 - appveyor DownloadFile https://www.lua.org/ftp/lua-5.2.4.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
- tar xf lua-5.2.4.tar.gz - tar xf lua-5.2.4.tar.gz
- move lua-5.2.4\src lua - move lua-5.2.4\src lua
- ps: Start-FileDownload https://sqlite.org/2016/sqlite-amalgamation-3140100.zip - appveyor DownloadFile https://www.sqlite.org/2016/sqlite-amalgamation-3140200.zip
- 7z x sqlite-amalgamation-3140100.zip - 7z x sqlite-amalgamation-3140200.zip
- move sqlite-amalgamation-3140100 sqlite3 - move sqlite-amalgamation-3140200 sqlite3
# let premake happy # let premake happy
- move event.premake4.lua event/premake4.lua - xcopy /E premake\* .
- move freetype.premake4.lua freetype/premake4.lua
- move irrlicht.premake4.lua irrlicht/premake4.lua # patch irrlicht
- move lua.premake4.lua lua/premake4.lua - patch -p0 < irrlicht\irrlicht.patch
- move sqlite3.premake4.lua sqlite3/premake4.lua
# premake # premake
- premake5 vs2015 - premake5 vs2015
......
event.premake4.lua deleted 100644 → 0
View file @ 0f53b60a
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" }
freetype.premake4.lua deleted 100644 → 0
View file @ 0f53b60a
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" }
irrlicht.premake4.lua deleted 100644 → 0
View file @ 0f53b60a
project "Irrlicht"
kind "StaticLib"
includedirs { "include", "src\\zlib", "src\\jpeglib", "src\\libpng" }
defines { "_IRR_STATIC_LIB_" }
flags { "NoExceptions", "NoRTTI" }
files { "include\\EDriverFeatures.h", "include\\EMaterialFlags.h", "include\\IAnimatedMeshMD3.h", "include\\IEventReceiver.h", "include\\ILogger.h", "include\\IOSOperator.h", "include\\IRandomizer.h", "include\\IReferenceCounted.h", "include\\IrrCompileConfig.h", "include\\irrlicht.h", "include\\IrrlichtDevice.h", "include\\irrTypes.h", "include\\ITimer.h", "include\\Keycodes.h", "include\\SIrrCreationParameters.h", "include\\SKeyMap.h", "include\\EDriverTypes.h", "include\\IGeometryCreator.h", "include\\IGPUProgrammingServices.h", "include\\IImage.h", "include\\IImageLoader.h", "include\\IMaterialRenderer.h", "include\\IMaterialRendererServices.h", "include\\IShaderConstantSetCallBack.h", "include\\ITexture.h", "include\\IVideoDriver.h", "include\\IVideoModeList.h", "include\\S3DVertex.h", "include\\SColor.h", "include\\SExposedVideoData.h", "include\\SLight.h", "include\\SMaterial.h", "include\\SMaterialLayer.h", "include\\aabbox3d.h", "include\\coreutil.h", "include\\dimension2d.h", "include\\heapsort.h", "include\\irrAllocator.h", "include\\irrArray.h", "include\\irrList.h", "include\\irrMap.h", "include\\irrMath.h", "include\\irrString.h", "include\\line2d.h", "include\\line3d.h", "include\\matrix4.h", "include\\plane3d.h", "include\\position2d.h", "include\\quaternion.h", "include\\rect.h", "include\\triangle3d.h", "include\\vector2d.h", "include\\vector3d.h", "include\\EAttributes.h", "include\\IAttributeExchangingObject.h", "include\\IAttributes.h", "include\\IFileList.h", "include\\IFileSystem.h", "include\\IReadFile.h", "include\\irrXML.h", "include\\IWriteFile.h", "include\\IXMLReader.h", "include\\IXMLWriter.h", "include\\path.h", "include\\CDynamicMeshBuffer.h", "include\\CIndexBuffer.h", "include\\CMeshBuffer.h", "include\\CVertexBuffer.h", "include\\ECullingTypes.h", "include\\EDebugSceneTypes.h", "include\\EMeshWriterEnums.h", "include\\EPrimitiveTypes.h", "include\\ESceneNodeAnimatorTypes.h", "include\\ESceneNodeTypes.h", "include\\IAnimatedMesh.h", "include\\IAnimatedMeshMD2.h", "include\\IAnimatedMeshSceneNode.h", "include\\IBillboardSceneNode.h", "include\\ICameraSceneNode.h", "include\\IDummyTransformationSceneNode.h", "include\\ILightSceneNode.h", "include\\IMesh.h", "include\\IMeshBuffer.h", "include\\IMeshCache.h", "include\\IMeshLoader.h", "include\\IMeshManipulator.h", "include\\IMeshSceneNode.h", "include\\IMeshWriter.h", "include\\IMetaTriangleSelector.h", "include\\IParticleAffector.h", "include\\IParticleAnimatedMeshSceneNodeEmitter.h", "include\\IParticleAttractionAffector.h", "include\\IParticleBoxEmitter.h", "include\\IParticleCylinderEmitter.h", "include\\IParticleEmitter.h", "include\\IParticleFadeOutAffector.h", "include\\IParticleGravityAffector.h", "include\\IParticleMeshEmitter.h", "include\\IParticleRingEmitter.h", "include\\IParticleRotationAffector.h", "include\\IParticleSphereEmitter.h", "include\\IParticleSystemSceneNode.h", "include\\IQ3LevelMesh.h", "include\\IQ3Shader.h", "include\\ISceneCollisionManager.h", "include\\ISceneManager.h", "include\\ISceneLoader.h", "include\\ISceneNode.h", "include\\ISceneNodeAnimator.h", "include\\ISceneNodeAnimatorCameraFPS.h", "include\\ISceneNodeAnimatorCameraMaya.h", "include\\ISceneNodeAnimatorCollisionResponse.h", "include\\ISceneNodeAnimatorFactory.h", "include\\ISceneNodeFactory.h", "include\\IShadowVolumeSceneNode.h", "include\\ISkinnedMesh.h", "include\\ITerrainSceneNode.h", "include\\ITextSceneNode.h", "include\\ITriangleSelector.h", "include\\IVolumeLightSceneNode.h", "include\\SAnimatedMesh.h", "include\\SceneParameters.h", "include\\SMesh.h", "include\\SMeshBuffer.h", "include\\SMeshBufferLightMap.h", "include\\SMeshBufferTangents.h", "include\\SParticle.h", "include\\SSkinMeshBuffer.h", "include\\SViewFrustum.h", "include\\EGUIAlignment.h", "include\\EGUIElementTypes.h", "include\\EMessageBoxFlags.h", "include\\ICursorControl.h", "include\\IGUIButton.h", "include\\IGUICheckbox.h", "include\\IGUIComboBox.h", "include\\IGUIContextMenu.h", "include\\IGUIEditBox.h", "include\\IGUIElement.h", "include\\IGUIElementFactory.h", "include\\IGUIEnvironment.h", "include\\IGUIFileOpenDialog.h", "include\\IGUIFont.h", "include\\IGUIImage.h", "include\\IGUIImageList.h", "include\\IGUIInOutFader.h", "include\\IGUIListBox.h", "include\\IGUIMeshViewer.h", "include\\IGUIScrollBar.h", "include\\IGUISkin.h", "include\\IGUISpinBox.h", "include\\IGUISpriteBank.h", "include\\IGUIStaticText.h", "include\\IGUITabControl.h", "include\\IGUIToolbar.h", "include\\IGUITreeView.h", "include\\IGUIWindow.h", "src\\CCgMaterialRenderer.h", "src\\CD3D9CgMaterialRenderer.h", "src\\CDefaultSceneNodeAnimatorFactory.h", "src\\CDefaultSceneNodeFactory.h", "src\\CGeometryCreator.h", "src\\CMeshCache.h", "src\\CMeshManipulator.h", "src\\COpenGLCgMaterialRenderer.h", "src\\CSceneManager.h", "src\\Octree.h", "src\\CSMFMeshFileLoader.h", "src\\C3DSMeshFileLoader.h", "src\\CAnimatedMeshHalfLife.h", "src\\CAnimatedMeshMD2.h", "src\\CAnimatedMeshMD3.h", "src\\CB3DMeshFileLoader.h", "src\\CBSPMeshFileLoader.h", "src\\CColladaFileLoader.h", "src\\CCSMLoader.h", "src\\CDMFLoader.h", "src\\CIrrMeshFileLoader.h", "src\\CLMTSMeshFileLoader.h", "src\\CLWOMeshFileLoader.h", "src\\CMD2MeshFileLoader.h", "src\\CMD3MeshFileLoader.h", "src\\CMS3DMeshFileLoader.h", "src\\CMY3DHelper.h", "src\\CMY3DMeshFileLoader.h", "src\\COBJMeshFileLoader.h", "src\\COCTLoader.h", "src\\COgreMeshFileLoader.h", "src\\CPLYMeshFileLoader.h", "src\\CQ3LevelMesh.h", "src\\CSkinnedMesh.h", "src\\CSTLMeshFileLoader.h", "src\\CXMeshFileLoader.h", "src\\dmfsupport.h", "src\\CAnimatedMeshSceneNode.h", "src\\CBillboardSceneNode.h", "src\\CBoneSceneNode.h", "src\\CCameraSceneNode.h", "src\\CCubeSceneNode.h", "src\\CDummyTransformationSceneNode.h", "src\\CEmptySceneNode.h", "src\\CLightSceneNode.h", "src\\CMeshSceneNode.h", "src\\COctreeSceneNode.h", "src\\CQuake3ShaderSceneNode.h", "src\\CShadowVolumeSceneNode.h", "src\\CSkyBoxSceneNode.h", "src\\CSkyDomeSceneNode.h", "src\\CSphereSceneNode.h", "src\\CTerrainSceneNode.h", "src\\CTextSceneNode.h", "src\\CVolumeLightSceneNode.h", "src\\CWaterSurfaceSceneNode.h", "src\\CParticleAnimatedMeshSceneNodeEmitter.h", "src\\CParticleAttractionAffector.h", "src\\CParticleBoxEmitter.h", "src\\CParticleCylinderEmitter.h", "src\\CParticleFadeOutAffector.h", "src\\CParticleGravityAffector.h", "src\\CParticleMeshEmitter.h", "src\\CParticlePointEmitter.h", "src\\CParticleRingEmitter.h", "src\\CParticleRotationAffector.h", "src\\CParticleScaleAffector.h", "src\\CParticleSphereEmitter.h", "src\\CParticleSystemSceneNode.h", "src\\CMetaTriangleSelector.h", "src\\COctreeTriangleSelector.h", "src\\CSceneCollisionManager.h", "src\\CTerrainTriangleSelector.h", "src\\CTriangleBBSelector.h", "src\\CTriangleSelector.h", "src\\CSceneLoaderIrr.h", "src\\CSceneNodeAnimatorCameraFPS.h", "src\\CSceneNodeAnimatorCameraMaya.h", "src\\CSceneNodeAnimatorCollisionResponse.h", "src\\CSceneNodeAnimatorDelete.h", "src\\CSceneNodeAnimatorFlyCircle.h", "src\\CSceneNodeAnimatorFlyStraight.h", "src\\CSceneNodeAnimatorFollowSpline.h", "src\\CSceneNodeAnimatorRotation.h", "src\\CSceneNodeAnimatorTexture.h", "src\\CColladaMeshWriter.h", "src\\CIrrMeshWriter.h", "src\\COBJMeshWriter.h", "src\\CPLYMeshWriter.h", "src\\CSTLMeshWriter.h", "src\\CVideoModeList.h", "src\\CSoftwareDriver.h", "src\\CSoftwareTexture.h", "src\\CTRTextureGouraud.h", "src\\CZBuffer.h", "src\\ITriangleRenderer.h", "src\\IZBuffer.h", "src\\resource.h", "src\\S2DVertex.h", "src\\COpenGLDriver.h", "src\\COpenGLExtensionHandler.h", "src\\COpenGLMaterialRenderer.h", "src\\COpenGLNormalMapRenderer.h", "src\\COpenGLParallaxMapRenderer.h", "src\\COpenGLShaderMaterialRenderer.h", "src\\COpenGLSLMaterialRenderer.h", "src\\COpenGLTexture.h", "src\\glext.h", "src\\wglext.h", "src\\CD3D8Driver.h", "src\\CD3D8MaterialRenderer.h", "src\\CD3D8NormalMapRenderer.h", "src\\CD3D8ParallaxMapRenderer.h", "src\\CD3D8ShaderMaterialRenderer.h", "src\\CD3D8Texture.h", "src\\CColorConverter.h", "src\\CFPSCounter.h", "src\\CImage.h", "src\\CNullDriver.h", "src\\IImagePresenter.h", "src\\CImageWriterBMP.h", "src\\CImageWriterJPG.h", "src\\CImageWriterPCX.h", "src\\CImageWriterPNG.h", "src\\CImageWriterPPM.h", "src\\CImageWriterPSD.h", "src\\CImageWriterTGA.h", "src\\CImageLoaderBMP.h", "src\\CImageLoaderDDS.h", "src\\CImageLoaderJPG.h", "src\\CImageLoaderPCX.h", "src\\CImageLoaderPNG.h", "src\\CImageLoaderPPM.h", "src\\CImageLoaderPSD.h", "src\\CImageLoaderRGB.h", "src\\CImageLoaderTGA.h", "src\\CImageLoaderWAL.h", "src\\CD3D9Driver.h", "src\\CD3D9HLSLMaterialRenderer.h", "src\\CD3D9MaterialRenderer.h", "src\\CD3D9NormalMapRenderer.h", "src\\CD3D9ParallaxMapRenderer.h", "src\\CD3D9ShaderMaterialRenderer.h", "src\\CD3D9Texture.h", "src\\CDepthBuffer.h", "src\\CSoftware2MaterialRenderer.h", "src\\CSoftwareDriver2.h", "src\\CSoftwareTexture2.h", "src\\IBurningShader.h", "src\\IDepthBuffer.h", "src\\S4DVertex.h", "src\\SoftwareDriver2_compile_config.h", "src\\SoftwareDriver2_helper.h", "src\\CLogger.h", "src\\COSOperator.h", "src\\CTimer.h", "src\\os.h", "src\\lzma\\LzmaDec.h", "src\\lzma\\Types.h", "src\\zlib\\crc32.h", "src\\zlib\\deflate.h", "src\\zlib\\inffast.h", "src\\zlib\\inffixed.h", "src\\zlib\\inftrees.h", "src\\zlib\\trees.h", "src\\zlib\\zconf.h", "src\\zlib\\zlib.h", "src\\zlib\\zutil.h", "src\\jpeglib\\cderror.h", "src\\jpeglib\\jconfig.h", "src\\jpeglib\\jdct.h", "src\\jpeglib\\jerror.h", "src\\jpeglib\\jinclude.h", "src\\jpeglib\\jmemsys.h", "src\\jpeglib\\jmorecfg.h", "src\\jpeglib\\jpegint.h", "src\\jpeglib\\jpeglib.h", "src\\jpeglib\\jversion.h", "src\\libpng\\png.h", "src\\libpng\\pngconf.h", "src\\aesGladman\\aes.h", "src\\aesGladman\\aesopt.h", "src\\aesGladman\\fileenc.h", "src\\aesGladman\\hmac.h", "src\\aesGladman\\prng.h", "src\\aesGladman\\pwd2key.h", "src\\aesGladman\\sha1.h", "src\\aesGladman\\sha2.h", "src\\bzip2\\bzlib.h", "src\\bzip2\\bzlib_private.h", "src\\CIrrDeviceConsole.h", "src\\CIrrDeviceFB.h", "src\\CIrrDeviceLinux.h", "src\\CIrrDeviceSDL.h", "src\\CIrrDeviceStub.h", "src\\CIrrDeviceWin32.h", "src\\CIrrDeviceWinCE.h", "src\\CAttributeImpl.h", "src\\CAttributes.h", "src\\CFileList.h", "src\\CFileSystem.h", "src\\CLimitReadFile.h", "src\\CMemoryFile.h", "src\\CMountPointReader.h", "src\\CNPKReader.h", "src\\CPakReader.h", "src\\CReadFile.h", "src\\CTarReader.h", "src\\CWADReader.h", "src\\CWriteFile.h", "src\\CXMLReader.h", "src\\CXMLReaderImpl.h", "src\\CXMLWriter.h", "src\\CZipReader.h", "src\\IAttribute.h", "src\\BuiltInFont.h", "src\\CDefaultGUIElementFactory.h", "src\\CGUIButton.h", "src\\CGUICheckbox.h", "src\\CGUIColorSelectDialog.h", "src\\CGUIComboBox.h", "src\\CGUIContextMenu.h", "src\\CGUIEditBox.h", "src\\CGUIEnvironment.h", "src\\CGUIFileOpenDialog.h", "src\\CGUIFont.h", "src\\CGUIImage.h", "src\\CGUIImageList.h", "src\\CGUIInOutFader.h", "src\\CGUIListBox.h", "src\\CGUIMenu.h", "src\\CGUIMeshViewer.h", "src\\CGUIMessageBox.h", "src\\CGUIModalScreen.h", "src\\CGUIScrollBar.h", "src\\CGUISkin.h", "src\\CGUISpinBox.h", "src\\CGUISpriteBank.h", "src\\CGUIStaticText.h", "src\\CGUITabControl.h", "src\\CGUITable.h", "src\\CGUIToolBar.h", "src\\CGUITreeView.h", "src\\CGUIWindow.h", "src\\CCgMaterialRenderer.cpp", "src\\CD3D9CgMaterialRenderer.cpp", "src\\CDefaultSceneNodeAnimatorFactory.cpp", "src\\CDefaultSceneNodeFactory.cpp", "src\\CGeometryCreator.cpp", "src\\CMeshCache.cpp", "src\\CMeshManipulator.cpp", "src\\COpenGLCgMaterialRenderer.cpp", "src\\CSceneManager.cpp", "src\\C3DSMeshFileLoader.cpp", "src\\CSMFMeshFileLoader.cpp", "src\\CAnimatedMeshHalfLife.cpp", "src\\CAnimatedMeshMD2.cpp", "src\\CAnimatedMeshMD3.cpp", "src\\CB3DMeshFileLoader.cpp", "src\\CBSPMeshFileLoader.cpp", "src\\CColladaFileLoader.cpp", "src\\CCSMLoader.cpp", "src\\CDMFLoader.cpp", "src\\CIrrMeshFileLoader.cpp", "src\\CLMTSMeshFileLoader.cpp", "src\\CLWOMeshFileLoader.cpp", "src\\CMD2MeshFileLoader.cpp", "src\\CMD3MeshFileLoader.cpp", "src\\CMS3DMeshFileLoader.cpp", "src\\CMY3DMeshFileLoader.cpp", "src\\COBJMeshFileLoader.cpp", "src\\COCTLoader.cpp", "src\\COgreMeshFileLoader.cpp", "src\\CPLYMeshFileLoader.cpp", "src\\CQ3LevelMesh.cpp", "src\\CSkinnedMesh.cpp", "src\\CSTLMeshFileLoader.cpp", "src\\CXMeshFileLoader.cpp", "src\\CAnimatedMeshSceneNode.cpp", "src\\CBillboardSceneNode.cpp", "src\\CBoneSceneNode.cpp", "src\\CCameraSceneNode.cpp", "src\\CCubeSceneNode.cpp", "src\\CDummyTransformationSceneNode.cpp", "src\\CEmptySceneNode.cpp", "src\\CLightSceneNode.cpp", "src\\CMeshSceneNode.cpp", "src\\COctreeSceneNode.cpp", "src\\CQuake3ShaderSceneNode.cpp", "src\\CShadowVolumeSceneNode.cpp", "src\\CSkyBoxSceneNode.cpp", "src\\CSkyDomeSceneNode.cpp", "src\\CSphereSceneNode.cpp", "src\\CTerrainSceneNode.cpp", "src\\CTextSceneNode.cpp", "src\\CVolumeLightSceneNode.cpp", "src\\CWaterSurfaceSceneNode.cpp", "src\\CParticleAnimatedMeshSceneNodeEmitter.cpp", "src\\CParticleAttractionAffector.cpp", "src\\CParticleBoxEmitter.cpp", "src\\CParticleCylinderEmitter.cpp", "src\\CParticleFadeOutAffector.cpp", "src\\CParticleGravityAffector.cpp", "src\\CParticleMeshEmitter.cpp", "src\\CParticlePointEmitter.cpp", "src\\CParticleRingEmitter.cpp", "src\\CParticleRotationAffector.cpp", "src\\CParticleScaleAffector.cpp", "src\\CParticleSphereEmitter.cpp", "src\\CParticleSystemSceneNode.cpp", "src\\CMetaTriangleSelector.cpp", "src\\COctreeTriangleSelector.cpp", "src\\CSceneCollisionManager.cpp", "src\\CTerrainTriangleSelector.cpp", "src\\CTriangleBBSelector.cpp", "src\\CTriangleSelector.cpp", "src\\CSceneLoaderIrr.cpp", "src\\CSceneNodeAnimatorCameraFPS.cpp", "src\\CSceneNodeAnimatorCameraMaya.cpp", "src\\CSceneNodeAnimatorCollisionResponse.cpp", "src\\CSceneNodeAnimatorDelete.cpp", "src\\CSceneNodeAnimatorFlyCircle.cpp", "src\\CSceneNodeAnimatorFlyStraight.cpp", "src\\CSceneNodeAnimatorFollowSpline.cpp", "src\\CSceneNodeAnimatorRotation.cpp", "src\\CSceneNodeAnimatorTexture.cpp", "src\\CColladaMeshWriter.cpp", "src\\CIrrMeshWriter.cpp", "src\\COBJMeshWriter.cpp", "src\\CPLYMeshWriter.cpp", "src\\CSTLMeshWriter.cpp", "src\\CVideoModeList.cpp", "src\\CSoftwareDriver.cpp", "src\\CSoftwareTexture.cpp", "src\\CTRFlat.cpp", "src\\CTRFlatWire.cpp", "src\\CTRGouraud.cpp", "src\\CTRGouraudWire.cpp", "src\\CTRTextureFlat.cpp", "src\\CTRTextureFlatWire.cpp", "src\\CTRTextureGouraud.cpp", "src\\CTRTextureGouraudAdd.cpp", "src\\CTRTextureGouraudNoZ.cpp", "src\\CTRTextureGouraudWire.cpp", "src\\CZBuffer.cpp", "src\\COpenGLDriver.cpp", "src\\COpenGLExtensionHandler.cpp", "src\\COpenGLNormalMapRenderer.cpp", "src\\COpenGLParallaxMapRenderer.cpp", "src\\COpenGLShaderMaterialRenderer.cpp", "src\\COpenGLSLMaterialRenderer.cpp", "src\\COpenGLTexture.cpp", "src\\CD3D8Driver.cpp", "src\\CD3D8NormalMapRenderer.cpp", "src\\CD3D8ParallaxMapRenderer.cpp", "src\\CD3D8ShaderMaterialRenderer.cpp", "src\\CD3D8Texture.cpp", "src\\CColorConverter.cpp", "src\\CFPSCounter.cpp", "src\\CImage.cpp", "src\\CNullDriver.cpp", "src\\CImageWriterBMP.cpp", "src\\CImageWriterJPG.cpp", "src\\CImageWriterPCX.cpp", "src\\CImageWriterPNG.cpp", "src\\CImageWriterPPM.cpp", "src\\CImageWriterPSD.cpp", "src\\CImageWriterTGA.cpp", "src\\CImageLoaderBMP.cpp", "src\\CImageLoaderDDS.cpp", "src\\CImageLoaderJPG.cpp", "src\\CImageLoaderPCX.cpp", "src\\CImageLoaderPNG.cpp", "src\\CImageLoaderPPM.cpp", "src\\CImageLoaderPSD.cpp", "src\\CImageLoaderRGB.cpp", "src\\CImageLoaderTGA.cpp", "src\\CImageLoaderWAL.cpp", "src\\CD3D9Driver.cpp", "src\\CD3D9HLSLMaterialRenderer.cpp", "src\\CD3D9NormalMapRenderer.cpp", "src\\CD3D9ParallaxMapRenderer.cpp", "src\\CD3D9ShaderMaterialRenderer.cpp", "src\\CD3D9Texture.cpp", "src\\CBurningShader_Raster_Reference.cpp", "src\\CDepthBuffer.cpp", "src\\CSoftwareDriver2.cpp", "src\\CSoftwareTexture2.cpp", "src\\CTRGouraud2.cpp", "src\\CTRGouraudAlpha2.cpp", "src\\CTRGouraudAlphaNoZ2.cpp", "src\\CTRNormalMap.cpp", "src\\CTRStencilShadow.cpp", "src\\CTRTextureBlend.cpp", "src\\CTRTextureDetailMap2.cpp", "src\\CTRTextureGouraud2.cpp", "src\\CTRTextureGouraudAdd2.cpp", "src\\CTRTextureGouraudAddNoZ2.cpp", "src\\CTRTextureGouraudAlpha.cpp", "src\\CTRTextureGouraudAlphaNoZ.cpp", "src\\CTRTextureGouraudNoZ2.cpp", "src\\CTRTextureGouraudVertexAlpha2.cpp", "src\\CTRTextureLightMap2_Add.cpp", "src\\CTRTextureLightMap2_M1.cpp", "src\\CTRTextureLightMap2_M2.cpp", "src\\CTRTextureLightMap2_M4.cpp", "src\\CTRTextureLightMapGouraud2_M4.cpp", "src\\CTRTextureWire2.cpp", "src\\IBurningShader.cpp", "src\\CLogger.cpp", "src\\COSOperator.cpp", "src\\Irrlicht.cpp", "src\\os.cpp", "src\\lzma\\LzmaDec.c", "src\\zlib\\adler32.c", "src\\zlib\\compress.c", "src\\zlib\\crc32.c", "src\\zlib\\deflate.c", "src\\zlib\\inffast.c", "src\\zlib\\inflate.c", "src\\zlib\\inftrees.c", "src\\zlib\\trees.c", "src\\zlib\\uncompr.c", "src\\zlib\\zutil.c", "src\\jpeglib\\jaricom.c", "src\\jpeglib\\jcapimin.c", "src\\jpeglib\\jcapistd.c", "src\\jpeglib\\jcarith.c", "src\\jpeglib\\jccoefct.c", "src\\jpeglib\\jccolor.c", "src\\jpeglib\\jcdctmgr.c", "src\\jpeglib\\jchuff.c", "src\\jpeglib\\jcinit.c", "src\\jpeglib\\jcmainct.c", "src\\jpeglib\\jcmarker.c", "src\\jpeglib\\jcmaster.c", "src\\jpeglib\\jcomapi.c", "src\\jpeglib\\jcparam.c", "src\\jpeglib\\jcprepct.c", "src\\jpeglib\\jcsample.c", "src\\jpeglib\\jctrans.c", "src\\jpeglib\\jdapimin.c", "src\\jpeglib\\jdapistd.c", "src\\jpeglib\\jdarith.c", "src\\jpeglib\\jdatadst.c", "src\\jpeglib\\jdatasrc.c", "src\\jpeglib\\jdcoefct.c", "src\\jpeglib\\jdcolor.c", "src\\jpeglib\\jddctmgr.c", "src\\jpeglib\\jdhuff.c", "src\\jpeglib\\jdinput.c", "src\\jpeglib\\jdmainct.c", "src\\jpeglib\\jdmarker.c", "src\\jpeglib\\jdmaster.c", "src\\jpeglib\\jdmerge.c", "src\\jpeglib\\jdpostct.c", "src\\jpeglib\\jdsample.c", "src\\jpeglib\\jdtrans.c", "src\\jpeglib\\jerror.c", "src\\jpeglib\\jfdctflt.c", "src\\jpeglib\\jfdctfst.c", "src\\jpeglib\\jfdctint.c", "src\\jpeglib\\jidctflt.c", "src\\jpeglib\\jidctfst.c", "src\\jpeglib\\jidctint.c", "src\\jpeglib\\jmemmgr.c", "src\\jpeglib\\jmemnobs.c", "src\\jpeglib\\jquant1.c", "src\\jpeglib\\jquant2.c", "src\\jpeglib\\jutils.c", "src\\libpng\\png.c", "src\\libpng\\pngerror.c", "src\\libpng\\pngget.c", "src\\libpng\\pngmem.c", "src\\libpng\\pngpread.c", "src\\libpng\\pngread.c", "src\\libpng\\pngrio.c", "src\\libpng\\pngrtran.c", "src\\libpng\\pngrutil.c", "src\\libpng\\pngset.c", "src\\libpng\\pngtrans.c", "src\\libpng\\pngwio.c", "src\\libpng\\pngwrite.c", "src\\libpng\\pngwtran.c", "src\\libpng\\pngwutil.c", "src\\aesGladman\\aescrypt.cpp", "src\\aesGladman\\aeskey.cpp", "src\\aesGladman\\aestab.cpp", "src\\aesGladman\\fileenc.cpp", "src\\aesGladman\\hmac.cpp", "src\\aesGladman\\prng.cpp", "src\\aesGladman\\pwd2key.cpp", "src\\aesGladman\\sha1.cpp", "src\\aesGladman\\sha2.cpp", "src\\bzip2\\blocksort.c", "src\\bzip2\\bzcompress.c", "src\\bzip2\\bzlib.c", "src\\bzip2\\crctable.c", "src\\bzip2\\decompress.c", "src\\bzip2\\huffman.c", "src\\bzip2\\randtable.c", "src\\CIrrDeviceConsole.cpp", "src\\CIrrDeviceFB.cpp", "src\\CIrrDeviceLinux.cpp", "src\\CIrrDeviceSDL.cpp", "src\\CIrrDeviceStub.cpp", "src\\CIrrDeviceWin32.cpp", "src\\CIrrDeviceWinCE.cpp", "src\\CAttributes.cpp", "src\\CFileList.cpp", "src\\CFileSystem.cpp", "src\\CLimitReadFile.cpp", "src\\CMemoryFile.cpp", "src\\CMountPointReader.cpp", "src\\CNPKReader.cpp", "src\\CPakReader.cpp", "src\\CReadFile.cpp", "src\\CTarReader.cpp", "src\\CWADReader.cpp", "src\\CWriteFile.cpp", "src\\CXMLReader.cpp", "src\\CXMLWriter.cpp", "src\\CZipReader.cpp", "src\\irrXML.cpp", "src\\CDefaultGUIElementFactory.cpp", "src\\CGUIButton.cpp", "src\\CGUICheckbox.cpp", "src\\CGUIColorSelectDialog.cpp", "src\\CGUIComboBox.cpp", "src\\CGUIContextMenu.cpp", "src\\CGUIEditBox.cpp", "src\\CGUIEnvironment.cpp", "src\\CGUIFileOpenDialog.cpp", "src\\CGUIFont.cpp", "src\\CGUIImage.cpp", "src\\CGUIImageList.cpp", "src\\CGUIInOutFader.cpp", "src\\CGUIListBox.cpp", "src\\CGUIMenu.cpp", "src\\CGUIMeshViewer.cpp", "src\\CGUIMessageBox.cpp", "src\\CGUIModalScreen.cpp", "src\\CGUIScrollBar.cpp", "src\\CGUISkin.cpp", "src\\CGUISpinBox.cpp", "src\\CGUISpriteBank.cpp", "src\\CGUIStaticText.cpp", "src\\CGUITabControl.cpp", "src\\CGUITable.cpp", "src\\CGUIToolBar.cpp", "src\\CGUITreeView.cpp", "src\\CGUIWindow.cpp" }
configuration { "vs*" }
defines { "IRRLICHT_FAST_MATH", "UNICODE", "_UNICODE" }
includedirs { "$(DXSDK_DIR)include" }
libdirs { "$(DXSDK_DIR)Lib\\x86" }
configuration { "windows" }
links { "imm32" }
premake/event/premake4.lua 0 → 100644
View file @ 5b373cdd
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" }
premake/freetype/premake4.lua 0 → 100644
View file @ 5b373cdd
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" }
gframe/ygopro.rc → premake/gframe/ygopro.rc
View file @ 5b373cdd
1 ICON "ygopro.ico" 1 ICON "ygopro.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 1, 0, 33, 11 FILEVERSION 1, 0, 33, 11
PRODUCTVERSION 1, 0, 33, 11 PRODUCTVERSION 1, 0, 33, 11
...@@ -13,7 +11,7 @@ BLOCK "StringFileInfo" ...@@ -13,7 +11,7 @@ BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "080404b0" BLOCK "080404b0"
BEGIN BEGIN
VALUE "FileDescription", "YGOPRO" VALUE "FileDescription", "YGOPRO ver.mycard"
VALUE "InternalName", "YGOPRO" VALUE "InternalName", "YGOPRO"
VALUE "LegalCopyright", "Copyright (C) 2016 Fluorohydride" VALUE "LegalCopyright", "Copyright (C) 2016 Fluorohydride"
VALUE "OriginalFilename", "ygopro.exe" VALUE "OriginalFilename", "ygopro.exe"
......
irrlicht.patch → premake/irrlicht/irrlicht.patch
View file @ 5b373cdd
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 --- 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 @@ @@ -26,11 +26,11 @@
} }
...@@ -15,9 +15,9 @@ diff -ur --strip-trailing-cr irrlicht/include/IOSOperator.h ../ygopro-build/irrl ...@@ -15,9 +15,9 @@ diff -ur --strip-trailing-cr irrlicht/include/IOSOperator.h ../ygopro-build/irrl
//! Get the processor speed in megahertz //! Get the processor speed in megahertz
/** \param MHz The integer variable to store the speed in. /** \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 --- 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 @@ @@ -48,7 +48,9 @@
typedef signed short s16; typedef signed short s16;
#endif #endif
...@@ -29,9 +29,9 @@ diff -ur --strip-trailing-cr irrlicht/include/irrTypes.h ../ygopro-build/irrlich ...@@ -29,9 +29,9 @@ diff -ur --strip-trailing-cr irrlicht/include/irrTypes.h ../ygopro-build/irrlich
//! 32 bit unsigned variable. //! 32 bit unsigned variable.
/** This is a typedef for unsigned int, it ensures portability of the engine. */ /** 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 --- 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 @@ @@ -89,7 +89,7 @@
KEY_KEY_X = 0x58, // X key KEY_KEY_X = 0x58, // X key
KEY_KEY_Y = 0x59, // Y key KEY_KEY_Y = 0x59, // Y key
...@@ -41,9 +41,9 @@ diff -ur --strip-trailing-cr irrlicht/include/Keycodes.h ../ygopro-build/irrlich ...@@ -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_RWIN = 0x5C, // Right Windows key (Natural keyboard)
KEY_APPS = 0x5D, // Applications key (Natural keyboard) KEY_APPS = 0x5D, // Applications key (Natural keyboard)
KEY_SLEEP = 0x5F, // Computer Sleep key 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 --- 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 @@ @@ -329,7 +329,7 @@
strDllName += (int)D3DX_SDK_VERSION; strDllName += (int)D3DX_SDK_VERSION;
strDllName += ".dll"; strDllName += ".dll";
...@@ -80,9 +80,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CD3D9ShaderMaterialRenderer.cpp ../ygo ...@@ -80,9 +80,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CD3D9ShaderMaterialRenderer.cpp ../ygo
if (hMod) if (hMod)
pFn = (D3DXCompileShaderFromFileFunction)GetProcAddress(hMod, "D3DXCompileShaderFromFileA"); 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 --- 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 @@ @@ -286,7 +286,7 @@
const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd; const s32 realmbgn = MarkBegin < MarkEnd ? MarkBegin : MarkEnd;
const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin; const s32 realmend = MarkBegin < MarkEnd ? MarkEnd : MarkBegin;
...@@ -110,9 +110,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CGUIEditBox.cpp ../ygopro-build/irrlic ...@@ -110,9 +110,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CGUIEditBox.cpp ../ygopro-build/irrlic
if (p) if (p)
{ {
if (MarkBegin == MarkEnd) 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 --- 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 @@ @@ -16,14 +16,16 @@
#include "COSOperator.h" #include "COSOperator.h"
#include "dimension2d.h" #include "dimension2d.h"
...@@ -382,9 +382,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.cpp ../ygopro-build/ir ...@@ -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 --- 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 @@ @@ -395,7 +395,7 @@
bool Resized; bool Resized;
bool ExternalWindow; bool ExternalWindow;
...@@ -394,9 +394,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.h ../ygopro-build/irrl ...@@ -394,9 +394,9 @@ diff -ur --strip-trailing-cr irrlicht/src/CIrrDeviceWin32.h ../ygopro-build/irrl
SJoystickWin32Control* JoyControl; 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 --- 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 @@ @@ -85,11 +85,11 @@
bool COpenGLDriver::initDriver(CIrrDeviceWin32* device) bool COpenGLDriver::initDriver(CIrrDeviceWin32* device)
{ {
...@@ -472,9 +472,9 @@ diff -ur --strip-trailing-cr irrlicht/src/COpenGLDriver.cpp ../ygopro-build/irrl ...@@ -472,9 +472,9 @@ diff -ur --strip-trailing-cr irrlicht/src/COpenGLDriver.cpp ../ygopro-build/irrl
// get hdc // get hdc
HDc=GetDC(Window); 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 --- 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 @@ @@ -52,11 +52,8 @@
...@@ -543,9 +543,9 @@ diff -ur --strip-trailing-cr irrlicht/src/COSOperator.cpp ../ygopro-build/irrlic ...@@ -543,9 +543,9 @@ diff -ur --strip-trailing-cr irrlicht/src/COSOperator.cpp ../ygopro-build/irrlic
GlobalUnlock( hData ); GlobalUnlock( hData );
CloseClipboard(); CloseClipboard();
return buffer; 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 --- 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 @@ @@ -27,11 +27,11 @@
virtual const core::stringc& getOperatingSystemVersion() const; virtual const core::stringc& getOperatingSystemVersion() const;
...@@ -560,3 +560,21 @@ diff -ur --strip-trailing-cr irrlicht/src/COSOperator.h ../ygopro-build/irrlicht ...@@ -560,3 +560,21 @@ diff -ur --strip-trailing-cr irrlicht/src/COSOperator.h ../ygopro-build/irrlicht
//! gets the processor speed in megahertz //! gets the processor speed in megahertz
//! \param Mhz: //! \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)
{
premake/irrlicht/premake5.lua 0 → 100644
View file @ 5b373cdd
project "Irrlicht"
kind "StaticLib"
includedirs { "include", "src", "src/jpeglib", "src/libpng", "src/zlib" }
defines { "_IRR_STATIC_LIB_" }
exceptionhandling "Off"
rtti "Off"
files { "src/CCgMaterialRenderer.cpp",
"src/CD3D9CgMaterialRenderer.cpp",
"src/CDefaultSceneNodeAnimatorFactory.cpp",
"src/CDefaultSceneNodeFactory.cpp",
"src/CGeometryCreator.cpp",
"src/CMeshCache.cpp",
"src/CMeshManipulator.cpp",
"src/COpenGLCgMaterialRenderer.cpp",
"src/CSceneManager.cpp",
"src/C3DSMeshFileLoader.cpp",
"src/CSMFMeshFileLoader.cpp",
"src/CAnimatedMeshHalfLife.cpp",
"src/CAnimatedMeshMD2.cpp",
"src/CAnimatedMeshMD3.cpp",
"src/CB3DMeshFileLoader.cpp",
"src/CBSPMeshFileLoader.cpp",
"src/CColladaFileLoader.cpp",
"src/CCSMLoader.cpp",
"src/CDMFLoader.cpp",
"src/CIrrMeshFileLoader.cpp",
"src/CLMTSMeshFileLoader.cpp",
"src/CLWOMeshFileLoader.cpp",
"src/CMD2MeshFileLoader.cpp",
"src/CMD3MeshFileLoader.cpp",
"src/CMS3DMeshFileLoader.cpp",
"src/CMY3DMeshFileLoader.cpp",
"src/COBJMeshFileLoader.cpp",
"src/COCTLoader.cpp",
"src/COgreMeshFileLoader.cpp",
"src/CPLYMeshFileLoader.cpp",
"src/CQ3LevelMesh.cpp",
"src/CSkinnedMesh.cpp",
"src/CSTLMeshFileLoader.cpp",
"src/CXMeshFileLoader.cpp",
"src/CAnimatedMeshSceneNode.cpp",
"src/CBillboardSceneNode.cpp",
"src/CBoneSceneNode.cpp",
"src/CCameraSceneNode.cpp",
"src/CCubeSceneNode.cpp",
"src/CDummyTransformationSceneNode.cpp",
"src/CEmptySceneNode.cpp",
"src/CLightSceneNode.cpp",
"src/CMeshSceneNode.cpp",
"src/COctreeSceneNode.cpp",
"src/CQuake3ShaderSceneNode.cpp",
"src/CShadowVolumeSceneNode.cpp",
"src/CSkyBoxSceneNode.cpp",
"src/CSkyDomeSceneNode.cpp",
"src/CSphereSceneNode.cpp",
"src/CTerrainSceneNode.cpp",
"src/CTextSceneNode.cpp",
"src/CVolumeLightSceneNode.cpp",
"src/CWaterSurfaceSceneNode.cpp",
"src/CParticleAnimatedMeshSceneNodeEmitter.cpp",
"src/CParticleAttractionAffector.cpp",
"src/CParticleBoxEmitter.cpp",
"src/CParticleCylinderEmitter.cpp",
"src/CParticleFadeOutAffector.cpp",
"src/CParticleGravityAffector.cpp",
"src/CParticleMeshEmitter.cpp",
"src/CParticlePointEmitter.cpp",
"src/CParticleRingEmitter.cpp",
"src/CParticleRotationAffector.cpp",
"src/CParticleScaleAffector.cpp",
"src/CParticleSphereEmitter.cpp",
"src/CParticleSystemSceneNode.cpp",
"src/CMetaTriangleSelector.cpp",
"src/COctreeTriangleSelector.cpp",
"src/CSceneCollisionManager.cpp",
"src/CTerrainTriangleSelector.cpp",
"src/CTriangleBBSelector.cpp",
"src/CTriangleSelector.cpp",
"src/CSceneLoaderIrr.cpp",
"src/CSceneNodeAnimatorCameraFPS.cpp",
"src/CSceneNodeAnimatorCameraMaya.cpp",
"src/CSceneNodeAnimatorCollisionResponse.cpp",
"src/CSceneNodeAnimatorDelete.cpp",
"src/CSceneNodeAnimatorFlyCircle.cpp",
"src/CSceneNodeAnimatorFlyStraight.cpp",
"src/CSceneNodeAnimatorFollowSpline.cpp",
"src/CSceneNodeAnimatorRotation.cpp",
"src/CSceneNodeAnimatorTexture.cpp",
"src/CColladaMeshWriter.cpp",
"src/CIrrMeshWriter.cpp",
"src/COBJMeshWriter.cpp",
"src/CPLYMeshWriter.cpp",
"src/CSTLMeshWriter.cpp",
"src/CVideoModeList.cpp",
"src/CSoftwareDriver.cpp",
"src/CSoftwareTexture.cpp",
"src/CTRFlat.cpp",
"src/CTRFlatWire.cpp",
"src/CTRGouraud.cpp",
"src/CTRGouraudWire.cpp",
"src/CTRTextureFlat.cpp",
"src/CTRTextureFlatWire.cpp",
"src/CTRTextureGouraud.cpp",
"src/CTRTextureGouraudAdd.cpp",
"src/CTRTextureGouraudNoZ.cpp",
"src/CTRTextureGouraudWire.cpp",
"src/CZBuffer.cpp",
"src/COpenGLDriver.cpp",
"src/COpenGLExtensionHandler.cpp",
"src/COpenGLNormalMapRenderer.cpp",
"src/COpenGLParallaxMapRenderer.cpp",
"src/COpenGLShaderMaterialRenderer.cpp",
"src/COpenGLSLMaterialRenderer.cpp",
"src/COpenGLTexture.cpp",
"src/CD3D8Driver.cpp",
"src/CD3D8NormalMapRenderer.cpp",
"src/CD3D8ParallaxMapRenderer.cpp",
"src/CD3D8ShaderMaterialRenderer.cpp",
"src/CD3D8Texture.cpp",
"src/CColorConverter.cpp",
"src/CFPSCounter.cpp",
"src/CImage.cpp",
"src/CNullDriver.cpp",
"src/CImageWriterBMP.cpp",
"src/CImageWriterJPG.cpp",
"src/CImageWriterPCX.cpp",
"src/CImageWriterPNG.cpp",
"src/CImageWriterPPM.cpp",
"src/CImageWriterPSD.cpp",
"src/CImageWriterTGA.cpp",
"src/CImageLoaderBMP.cpp",
"src/CImageLoaderDDS.cpp",
"src/CImageLoaderJPG.cpp",
"src/CImageLoaderPCX.cpp",
"src/CImageLoaderPNG.cpp",
"src/CImageLoaderPPM.cpp",
"src/CImageLoaderPSD.cpp",
"src/CImageLoaderRGB.cpp",
"src/CImageLoaderTGA.cpp",
"src/CImageLoaderWAL.cpp",
"src/CD3D9Driver.cpp",
"src/CD3D9HLSLMaterialRenderer.cpp",
"src/CD3D9NormalMapRenderer.cpp",
"src/CD3D9ParallaxMapRenderer.cpp",
"src/CD3D9ShaderMaterialRenderer.cpp",
"src/CD3D9Texture.cpp",
"src/CBurningShader_Raster_Reference.cpp",
"src/CDepthBuffer.cpp",
"src/CSoftwareDriver2.cpp",
"src/CSoftwareTexture2.cpp",
"src/CTRGouraud2.cpp",
"src/CTRGouraudAlpha2.cpp",
"src/CTRGouraudAlphaNoZ2.cpp",
"src/CTRNormalMap.cpp",
"src/CTRStencilShadow.cpp",
"src/CTRTextureBlend.cpp",
"src/CTRTextureDetailMap2.cpp",
"src/CTRTextureGouraud2.cpp",
"src/CTRTextureGouraudAdd2.cpp",
"src/CTRTextureGouraudAddNoZ2.cpp",
"src/CTRTextureGouraudAlpha.cpp",
"src/CTRTextureGouraudAlphaNoZ.cpp",
"src/CTRTextureGouraudNoZ2.cpp",
"src/CTRTextureGouraudVertexAlpha2.cpp",
"src/CTRTextureLightMap2_Add.cpp",
"src/CTRTextureLightMap2_M1.cpp",
"src/CTRTextureLightMap2_M2.cpp",
"src/CTRTextureLightMap2_M4.cpp",
"src/CTRTextureLightMapGouraud2_M4.cpp",
"src/CTRTextureWire2.cpp",
"src/IBurningShader.cpp",
"src/CLogger.cpp",
"src/COSOperator.cpp",
"src/Irrlicht.cpp",
"src/os.cpp",
"src/lzma/LzmaDec.c",
"src/zlib/adler32.c",
"src/zlib/compress.c",
"src/zlib/crc32.c",
"src/zlib/deflate.c",
"src/zlib/inffast.c",
"src/zlib/inflate.c",
"src/zlib/inftrees.c",
"src/zlib/trees.c",
"src/zlib/uncompr.c",
"src/zlib/zutil.c",
"src/jpeglib/jaricom.c",
"src/jpeglib/jcapimin.c",
"src/jpeglib/jcapistd.c",
"src/jpeglib/jcarith.c",
"src/jpeglib/jccoefct.c",
"src/jpeglib/jccolor.c",
"src/jpeglib/jcdctmgr.c",
"src/jpeglib/jchuff.c",
"src/jpeglib/jcinit.c",
"src/jpeglib/jcmainct.c",
"src/jpeglib/jcmarker.c",
"src/jpeglib/jcmaster.c",
"src/jpeglib/jcomapi.c",
"src/jpeglib/jcparam.c",
"src/jpeglib/jcprepct.c",
"src/jpeglib/jcsample.c",
"src/jpeglib/jctrans.c",
"src/jpeglib/jdapimin.c",
"src/jpeglib/jdapistd.c",
"src/jpeglib/jdarith.c",
"src/jpeglib/jdatadst.c",
"src/jpeglib/jdatasrc.c",
"src/jpeglib/jdcoefct.c",
"src/jpeglib/jdcolor.c",
"src/jpeglib/jddctmgr.c",
"src/jpeglib/jdhuff.c",
"src/jpeglib/jdinput.c",
"src/jpeglib/jdmainct.c",
"src/jpeglib/jdmarker.c",
"src/jpeglib/jdmaster.c",
"src/jpeglib/jdmerge.c",
"src/jpeglib/jdpostct.c",
"src/jpeglib/jdsample.c",
"src/jpeglib/jdtrans.c",
"src/jpeglib/jerror.c",
"src/jpeglib/jfdctflt.c",
"src/jpeglib/jfdctfst.c",
"src/jpeglib/jfdctint.c",
"src/jpeglib/jidctflt.c",
"src/jpeglib/jidctfst.c",
"src/jpeglib/jidctint.c",
"src/jpeglib/jmemmgr.c",
"src/jpeglib/jmemnobs.c",
"src/jpeglib/jquant1.c",
"src/jpeglib/jquant2.c",
"src/jpeglib/jutils.c",
"src/libpng/png.c",
"src/libpng/pngerror.c",
"src/libpng/pngget.c",
"src/libpng/pngmem.c",
"src/libpng/pngpread.c",
"src/libpng/pngread.c",
"src/libpng/pngrio.c",
"src/libpng/pngrtran.c",
"src/libpng/pngrutil.c",
"src/libpng/pngset.c",
"src/libpng/pngtrans.c",
"src/libpng/pngwio.c",
"src/libpng/pngwrite.c",
"src/libpng/pngwtran.c",
"src/libpng/pngwutil.c",
"src/aesGladman/aescrypt.cpp",
"src/aesGladman/aeskey.cpp",
"src/aesGladman/aestab.cpp",
"src/aesGladman/fileenc.cpp",
"src/aesGladman/hmac.cpp",
"src/aesGladman/prng.cpp",
"src/aesGladman/pwd2key.cpp",
"src/aesGladman/sha1.cpp",
"src/aesGladman/sha2.cpp",
"src/bzip2/blocksort.c",
"src/bzip2/bzcompress.c",
"src/bzip2/bzlib.c",
"src/bzip2/crctable.c",
"src/bzip2/decompress.c",
"src/bzip2/huffman.c",
"src/bzip2/randtable.c",
"src/CIrrDeviceConsole.cpp",
"src/CIrrDeviceFB.cpp",
"src/CIrrDeviceLinux.cpp",
"src/CIrrDeviceSDL.cpp",
"src/CIrrDeviceStub.cpp",
"src/CIrrDeviceWin32.cpp",
"src/CIrrDeviceWinCE.cpp",
"src/CAttributes.cpp",
"src/CFileList.cpp",
"src/CFileSystem.cpp",
"src/CLimitReadFile.cpp",
"src/CMemoryFile.cpp",
"src/CMountPointReader.cpp",
"src/CNPKReader.cpp",
"src/CPakReader.cpp",
"src/CReadFile.cpp",
"src/CTarReader.cpp",
"src/CWADReader.cpp",
"src/CWriteFile.cpp",
"src/CXMLReader.cpp",
"src/CXMLWriter.cpp",
"src/CZipReader.cpp",
"src/irrXML.cpp",
"src/CDefaultGUIElementFactory.cpp",
"src/CGUIButton.cpp",
"src/CGUICheckbox.cpp",
"src/CGUIColorSelectDialog.cpp",
"src/CGUIComboBox.cpp",
"src/CGUIContextMenu.cpp",
"src/CGUIEditBox.cpp",
"src/CGUIEnvironment.cpp",
"src/CGUIFileOpenDialog.cpp",
"src/CGUIFont.cpp",
"src/CGUIImage.cpp",
"src/CGUIImageList.cpp",
"src/CGUIInOutFader.cpp",
"src/CGUIListBox.cpp",
"src/CGUIMenu.cpp",
"src/CGUIMeshViewer.cpp",
"src/CGUIMessageBox.cpp",
"src/CGUIModalScreen.cpp",
"src/CGUIScrollBar.cpp",
"src/CGUISkin.cpp",
"src/CGUISpinBox.cpp",
"src/CGUISpriteBank.cpp",
"src/CGUIStaticText.cpp",
"src/CGUITabControl.cpp",
"src/CGUITable.cpp",
"src/CGUIToolBar.cpp",
"src/CGUITreeView.cpp",
"src/CGUIWindow.cpp" }
configuration { "vs*" }
defines { "UNICODE", "_UNICODE" }
includedirs { "$(DXSDK_DIR)include" }
libdirs { "$(DXSDK_DIR)Lib/x86" }
configuration { "windows" }
links { "imm32" }
lua.premake4.lua → premake/lua/premake4.lua
View file @ 5b373cdd
project "lua" project "lua"
kind "StaticLib" kind "StaticLib"
files { "**.cc", "**.cpp", "**.c", "**.h" } files { "*.c", "*.h" }
premake5.lua 0 → 100644
View file @ 5b373cdd
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"
test.patch deleted 100644 → 0
View file @ 0f53b60a
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