Skip to content

I
Irrlicht New
Commit 9144cc0b authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into develop

parents e1daed7d 6a10131f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 250 deletions
.gitlab-ci.yml deleted 100644 → 0
View file @ e1daed7d
stages:
- build
- pack
- deploy
variables:
GIT_DEPTH: "1"
.build:
stage: build
script:
- cd source/Irrlicht/MacOSX/
- xcodebuild -project MacOSX.xcodeproj
- cd ../../../
- distPath=lib/$(arch)
- mkdir -p $distPath
- cp source/Irrlicht/MacOSX/build/Release/libIrrlicht.a $distPath/
artifacts:
paths:
- lib
build-i386:
extends: .build
tags:
- macos
build-arm64:
extends: .build
tags:
- macos-m1
pack:
stage: pack
tags:
- linux
dependencies:
- build-i386
- build-arm64
script:
- apt update; apt -y install tar
- mkdir dist
- tar -zcvf dist/irrlicht-mycard-mac.tar.gz lib include
artifacts:
paths:
- dist
upload_to_minio:
stage: deploy
dependencies:
- pack
tags:
- linux
script:
- aws s3 --endpoint=https://minio.mycard.moe:9000 cp dist/irrlicht-mycard-mac.tar.gz s3://mycard/ygopro-build-materials/
only:
- master
defines.lua deleted 100644 → 0
View file @ e1daed7d
defines {
"_IRR_STATIC_LIB_",
"NO_IRR_USE_NON_SYSTEM_BZLIB_",
"NO_IRR_COMPILE_WITH_BZIP2_",
"NO_IRR_COMPILE_WITH_CONSOLE_DEVICE_",
"NO_IRR_COMPILE_WITH_DIRECT3D_8_",
"NO_IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_",
"NO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_",
"NO_IRR_COMPILE_WITH_SOFTWARE_",
"NO_IRR_COMPILE_WITH_BURNINGSVIDEO_",
"NO_IRR_COMPILE_WITH_IRR_SCENE_LOADER_",
"NO_IRR_COMPILE_WITH_SKINNED_MESH_SUPPORT_",
"NO_IRR_COMPILE_WITH_IRR_MESH_LOADER_",
"NO_IRR_COMPILE_WITH_HALFLIFE_LOADER_",
"NO_IRR_COMPILE_WITH_MD2_LOADER_",
"NO_IRR_COMPILE_WITH_MD3_LOADER_",
"NO_IRR_COMPILE_WITH_3DS_LOADER_",
"NO_IRR_COMPILE_WITH_COLLADA_LOADER_",
"NO_IRR_COMPILE_WITH_CSM_LOADER_",
"NO_IRR_COMPILE_WITH_BSP_LOADER_",
"NO_IRR_COMPILE_WITH_DMF_LOADER_",
"NO_IRR_COMPILE_WITH_LMTS_LOADER_",
"NO_IRR_COMPILE_WITH_MY3D_LOADER_",
"NO_IRR_COMPILE_WITH_OBJ_LOADER_",
"NO_IRR_COMPILE_WITH_OCT_LOADER_",
"NO_IRR_COMPILE_WITH_LWO_LOADER_",
"NO_IRR_COMPILE_WITH_STL_LOADER_",
"NO_IRR_COMPILE_WITH_PLY_LOADER_",
"NO_IRR_COMPILE_WITH_SMF_LOADER_",
"NO_IRR_COMPILE_WITH_IRR_WRITER_",
"NO_IRR_COMPILE_WITH_COLLADA_WRITER_",
"NO_IRR_COMPILE_WITH_STL_WRITER_",
"NO_IRR_COMPILE_WITH_OBJ_WRITER_",
"NO_IRR_COMPILE_WITH_PLY_WRITER_",
"NO_IRR_COMPILE_WITH_PCX_LOADER_",
"NO_IRR_COMPILE_WITH_PPM_LOADER_",
"NO_IRR_COMPILE_WITH_PSD_LOADER_",
"NO_IRR_COMPILE_WITH_TGA_LOADER_",
"NO_IRR_COMPILE_WITH_WAL_LOADER_",
"NO_IRR_COMPILE_WITH_LMP_LOADER_",
"NO_IRR_COMPILE_WITH_RGB_LOADER_",
"NO_IRR_COMPILE_WITH_PCX_WRITER_",
"NO_IRR_COMPILE_WITH_PPM_WRITER_",
"NO_IRR_COMPILE_WITH_PSD_WRITER_",
"NO_IRR_COMPILE_WITH_TGA_WRITER_",
"NO__IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_",
"NO__IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_",
"NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_",
}
premake5-only-zipreader.lua deleted 100644 → 0
View file @ e1daed7d
project "irrlicht"
kind "StaticLib"
includedirs { "include", "source/Irrlicht", "source/Irrlicht/zlib" }
defines {
"_IRR_STATIC_LIB_",
"NO_IRR_COMPILE_WITH_ZIP_ENCRYPTION_",
"NO_IRR_COMPILE_WITH_BZIP2_",
"NO__IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_",
"NO__IRR_COMPILE_WITH_PAK_ARCHIVE_LOADER_",
"NO__IRR_COMPILE_WITH_NPK_ARCHIVE_LOADER_",
"NO__IRR_COMPILE_WITH_TAR_ARCHIVE_LOADER_",
"NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_"
}
exceptionhandling "Off"
rtti "Off"
files {
"source/Irrlicht/os.cpp",
"source/Irrlicht/zlib/adler32.c",
"source/Irrlicht/zlib/crc32.c",
"source/Irrlicht/zlib/inffast.c",
"source/Irrlicht/zlib/inflate.c",
"source/Irrlicht/zlib/inftrees.c",
"source/Irrlicht/zlib/zutil.c",
"source/Irrlicht/CAttributes.cpp",
"source/Irrlicht/CFileList.cpp",
"source/Irrlicht/CFileSystem.cpp",
"source/Irrlicht/CLimitReadFile.cpp",
"source/Irrlicht/CMemoryFile.cpp",
"source/Irrlicht/CReadFile.cpp",
"source/Irrlicht/CWriteFile.cpp",
"source/Irrlicht/CXMLReader.cpp",
"source/Irrlicht/CXMLWriter.cpp",
"source/Irrlicht/CZipReader.cpp"
}
filter { "system:windows" }
defines { "_IRR_WCHAR_FILESYSTEM" }
premake5.lua deleted 100644 → 0
View file @ e1daed7d
project "irrlicht"
kind "StaticLib"
includedirs { "include", "source/Irrlicht", "source/Irrlicht/jpeglib", "source/Irrlicht/libpng", "source/Irrlicht/zlib" }
dofile("defines.lua")
exceptionhandling "Off"
rtti "Off"
files { "include/*.h",
"source/Irrlicht/*.cpp",
"source/Irrlicht/lzma/*.h",
"source/Irrlicht/lzma/*.c",
"source/Irrlicht/zlib/zlib.h",
"source/Irrlicht/zlib/adler32.c",
"source/Irrlicht/zlib/compress.c",
"source/Irrlicht/zlib/crc32.h",
"source/Irrlicht/zlib/crc32.c",
"source/Irrlicht/zlib/deflate.h",
"source/Irrlicht/zlib/deflate.c",
"source/Irrlicht/zlib/inffast.h",
"source/Irrlicht/zlib/inffast.c",
"source/Irrlicht/zlib/inflate.h",
"source/Irrlicht/zlib/inflate.c",
"source/Irrlicht/zlib/inftrees.h",
"source/Irrlicht/zlib/inftrees.c",
"source/Irrlicht/zlib/trees.h",
"source/Irrlicht/zlib/trees.c",
"source/Irrlicht/zlib/uncompr.c",
"source/Irrlicht/zlib/zutil.h",
"source/Irrlicht/zlib/zutil.c",
"source/Irrlicht/jpeglib/jaricom.c",
"source/Irrlicht/jpeglib/jcapimin.c",
"source/Irrlicht/jpeglib/jcapistd.c",
"source/Irrlicht/jpeglib/jcarith.c",
"source/Irrlicht/jpeglib/jccoefct.c",
"source/Irrlicht/jpeglib/jccolor.c",
"source/Irrlicht/jpeglib/jcdctmgr.c",
"source/Irrlicht/jpeglib/jchuff.c",
"source/Irrlicht/jpeglib/jcinit.c",
"source/Irrlicht/jpeglib/jcmainct.c",
"source/Irrlicht/jpeglib/jcmarker.c",
"source/Irrlicht/jpeglib/jcmaster.c",
"source/Irrlicht/jpeglib/jcomapi.c",
"source/Irrlicht/jpeglib/jcparam.c",
"source/Irrlicht/jpeglib/jcprepct.c",
"source/Irrlicht/jpeglib/jcsample.c",
"source/Irrlicht/jpeglib/jctrans.c",
"source/Irrlicht/jpeglib/jdapimin.c",
"source/Irrlicht/jpeglib/jdapistd.c",
"source/Irrlicht/jpeglib/jdarith.c",
"source/Irrlicht/jpeglib/jdatadst.c",
"source/Irrlicht/jpeglib/jdatasrc.c",
"source/Irrlicht/jpeglib/jdcoefct.c",
"source/Irrlicht/jpeglib/jdcolor.c",
"source/Irrlicht/jpeglib/jddctmgr.c",
"source/Irrlicht/jpeglib/jdhuff.c",
"source/Irrlicht/jpeglib/jdinput.c",
"source/Irrlicht/jpeglib/jdmainct.c",
"source/Irrlicht/jpeglib/jdmarker.c",
"source/Irrlicht/jpeglib/jdmaster.c",
"source/Irrlicht/jpeglib/jdmerge.c",
"source/Irrlicht/jpeglib/jdpostct.c",
"source/Irrlicht/jpeglib/jdsample.c",
"source/Irrlicht/jpeglib/jdtrans.c",
"source/Irrlicht/jpeglib/jerror.c",
"source/Irrlicht/jpeglib/jfdctflt.c",
"source/Irrlicht/jpeglib/jfdctfst.c",
"source/Irrlicht/jpeglib/jfdctint.c",
"source/Irrlicht/jpeglib/jidctflt.c",
"source/Irrlicht/jpeglib/jidctfst.c",
"source/Irrlicht/jpeglib/jidctint.c",
"source/Irrlicht/jpeglib/jmemmgr.c",
"source/Irrlicht/jpeglib/jmemnobs.c",
"source/Irrlicht/jpeglib/jquant1.c",
"source/Irrlicht/jpeglib/jquant2.c",
"source/Irrlicht/jpeglib/jutils.c",
"source/Irrlicht/libpng/png.c",
"source/Irrlicht/libpng/pngerror.c",
"source/Irrlicht/libpng/pngget.c",
"source/Irrlicht/libpng/pngmem.c",
"source/Irrlicht/libpng/pngpread.c",
"source/Irrlicht/libpng/pngread.c",
"source/Irrlicht/libpng/pngrio.c",
"source/Irrlicht/libpng/pngrtran.c",
"source/Irrlicht/libpng/pngrutil.c",
"source/Irrlicht/libpng/pngset.c",
"source/Irrlicht/libpng/pngtrans.c",
"source/Irrlicht/libpng/pngwio.c",
"source/Irrlicht/libpng/pngwrite.c",
"source/Irrlicht/libpng/pngwtran.c",
"source/Irrlicht/libpng/pngwutil.c",
"source/Irrlicht/aesGladman/*.h",
"source/Irrlicht/aesGladman/*.cpp" }
filter { "system:windows" }
defines { "_IRR_WCHAR_FILESYSTEM" }
includedirs { "$(DXSDK_DIR)Include" }
libdirs { "$(DXSDK_DIR)Lib/x86" }
links { "imm32" }
filter { "system:linux" }
links { "X11", "Xxf86vm" }
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