Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/m1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ jobs:
}
$EXTRA_FLAGS += '-DOPENSSL_ROOT_DIR=${{steps.openssl.outputs.download-path}}'
}
cmake ../mcpelauncher '-DCMAKE_BUILD_TYPE=Release' '-DBUILD_UI=OFF' ('-DCMAKE_INSTALL_PREFIX=' + $INSDIR) -DCMAKE_ASM_FLAGS="--target=${{ matrix.triple }}" -DCMAKE_C_FLAGS="--target=${{ matrix.triple }} ${{ matrix.cflags }}" -DCMAKE_CXX_FLAGS="--target=${{ matrix.triple }} ${{ matrix.cxxflags }}" -DCMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} $EXTRA_FLAGS ${{ matrix.cmakeextraflags }} '-DMSA_DAEMON_PATH=.' '-DENABLE_DEV_PATHS=OFF' '-DXAL_WEBVIEW_QT_PATH=.'
cmake ../mcpelauncher '-DCMAKE_POLICY_VERSION_MINIMUM=4.0' '-DCMAKE_BUILD_TYPE=Release' '-DBUILD_UI=OFF' ('-DCMAKE_INSTALL_PREFIX=' + $INSDIR) -DCMAKE_ASM_FLAGS="--target=${{ matrix.triple }}" -DCMAKE_C_FLAGS="--target=${{ matrix.triple }} ${{ matrix.cflags }}" -DCMAKE_CXX_FLAGS="--target=${{ matrix.triple }} ${{ matrix.cxxflags }}" -DCMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} $EXTRA_FLAGS ${{ matrix.cmakeextraflags }} '-DMSA_DAEMON_PATH=.' '-DENABLE_DEV_PATHS=OFF' '-DXAL_WEBVIEW_QT_PATH=.'
make install -j4
popd
popd
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
default: ChristopherHX/MacOSX10.14.sdk
MacOSX1014sdkRef:
type: string
default: 5d1c9b28f01ef0b01225f92670ee587b430efa8e
default: 18f574aa8d71402560dd3cbf349a9f8b2cec3833
use-repo-files:
type: boolean
default: false
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
git clone https://github.com/llvm/llvm-project.git llvm -b release/10.x
mkdir -p libcxx32-build
cd libcxx32-build
cmake ../llvm/llvm -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release -DLIBCXX_BUILD_32_BITS=ON -DLIBCXXABI_BUILD_32_BITS=ON -DLLVM_BUILD_32_BITS=ON
cmake ../llvm/llvm -DCMAKE_POLICY_VERSION_MINIMUM=4.0 -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release -DLIBCXX_BUILD_32_BITS=ON -DLIBCXXABI_BUILD_32_BITS=ON -DLLVM_BUILD_32_BITS=ON
make -j8 cxx cxxabi
build-libcxx64:
runs-on: macos-13
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
git clone https://github.com/llvm/llvm-project.git llvm -b release/10.x
mkdir -p libcxx64-build
cd libcxx64-build
cmake ../llvm/llvm -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release
cmake ../llvm/llvm -DCMAKE_POLICY_VERSION_MINIMUM=4.0 -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release
make -j8 cxx cxxabi
build-libcxx:
runs-on: macos-13
Expand Down Expand Up @@ -462,6 +462,8 @@ jobs:
QT_PACKAGE_PREFIX: qt.qt5.5150.
QT_PACKAGE_SUFFIX: clang_64
QT_PREBUILT_SUFFIX: -MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64
env:
CMAKE_OSX_ARCHITECTURES: x86_64 # Is this needed? archive member: libglfw3.a(cocoa_init.m.o) cputype (16777223) does not match previous archive members cputype (7) (all members must match)
steps:
- name: Select Xcode
run: sudo xcode-select -switch /Applications/Xcode_14.2.app
Expand Down Expand Up @@ -647,7 +649,7 @@ jobs:
git -C libzip checkout v1.9.2
- name: Build libzip
run: |
cmake libzip -B libzip-build -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DENABLE_ZSTD=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DENABLE_FDOPEN=OFF
cmake libzip -B libzip-build -DCMAKE_POLICY_VERSION_MINIMUM=4.0 -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DENABLE_ZSTD=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_WINDOWS_CRYPTO=OFF -DENABLE_FDOPEN=OFF
cmake --build libzip-build --parallel
sudo cmake --build libzip-build --target install --parallel
- name: Install python dependencies
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
> [!WARNING]
> Deprecated CI scripts, I don't like piracy

### Can I play with an APK?

No, this allowed piracy that is forbidden in this project.
Expand Down
7 changes: 5 additions & 2 deletions __main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,16 @@ def clone_repo(name, url, branch):
if not path.isdir(CMAKE_INSTALL_PREFIX):
makedirs(CMAKE_INSTALL_PREFIX)

def cmake_cmd(source_dir):
return ['cmake', source_dir, '-DCMAKE_INSTALL_PREFIX=' + CMAKE_INSTALL_PREFIX, '-DCMAKE_POLICY_VERSION_MINIMUM=4.0']

def build_component(name, cmake_opts):
display_stage("Building: " + name)
source_dir = path.abspath(path.join(SOURCE_DIR, name))
build_dir = path.join(SOURCE_DIR, "build", name)
if not path.isdir(build_dir):
makedirs(build_dir)
call(['cmake', source_dir, '-DCMAKE_INSTALL_PREFIX=' + CMAKE_INSTALL_PREFIX] + cmake_opts, cwd=build_dir)
call(cmake_cmd(source_dir) + cmake_opts, cwd=build_dir)
call(['make', '-j' + str(cpu_count()), 'install'], cwd=build_dir)

def build_component32(name, cmake_opts):
Expand All @@ -118,7 +121,7 @@ def build_component32(name, cmake_opts):
build_dir = path.join(SOURCE_DIR, "build", name)
if not path.isdir(build_dir):
makedirs(build_dir)
call(['cmake', source_dir, '-DCMAKE_INSTALL_PREFIX=' + CMAKE_INSTALL_PREFIX] + cmake_opts, cwd=build_dir)
call(cmake_cmd(source_dir) + cmake_opts, cwd=build_dir)
call(['make', '-j' + str(cpu_count())], cwd=build_dir)
shutil.copy2(path.join(build_dir, 'mcpelauncher-client', 'mcpelauncher-client'), path.join(CMAKE_INSTALL_PREFIX, 'bin', 'mcpelauncher-client32'))

Expand Down
2 changes: 2 additions & 0 deletions templates/Info.plist.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<false/>
<key>SUAutomaticallyUpdate</key>
<false/>
<key>LSSupportsGameMode</key>
<true/>
<key>LSMinimumSystemVersion</key>
<string>{{ cf_bundle_macos_min }}</string>
<key>CFBundleDocumentTypes</key>
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.17.2
v1.x-nightly
2 changes: 1 addition & 1 deletion versionsdb.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6528e24b5db9b5532cff2f0dca1b739a292b14d3
HEAD
2 changes: 1 addition & 1 deletion versionsdbremote.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.1.x
HEAD
Loading