Selaa lähdekoodia

Merge branch 'main' into 12.x

Miku AuahDark 2 vuotta sitten
vanhempi
commit
6ba17b4b27
2 muutettua tiedostoa jossa 14 lisäystä ja 7 poistoa
  1. 3 3
      Makefile
  2. 11 4
      README.md

+ 3 - 3
Makefile

@@ -37,7 +37,7 @@ override INSTALLPREFIX := $(CURDIR)/installdir
 
 override CMAKE_PREFIX := $(CURDIR)/cmake
 CMAKE := $(CMAKE_PREFIX)/bin/cmake
-override CMAKE_OPTS := -DCMAKE_INSTALL_RPATH='$$ORIGIN/../lib' -DCMAKE_INSTALL_PREFIX=$(INSTALLPREFIX)
+override CMAKE_OPTS := --install-prefix $(INSTALLPREFIX) -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_RPATH='$$ORIGIN/../lib'
 override CONFIGURE := LDFLAGS="-Wl,-rpath,'\$$\$$ORIGIN/../lib' $$LDFLAGS" ../configure --prefix=$(INSTALLPREFIX)
 
 # CMake setup
@@ -175,7 +175,7 @@ $(BROTLI_PATH)/CMakeLists.txt:
 	git clone --depth 1 -b $(BROTLI_BRANCH) https://github.com/google/brotli $(BROTLI_PATH)
 
 $(BROTLI_PATH)/build/CMakeCache.txt: $(CMAKE) $(BROTLI_PATH)/CMakeLists.txt
-	$(CMAKE) -B$(BROTLI_PATH)/build -H$(BROTLI_PATH) $(CMAKE_OPTS)
+	$(CMAKE) -B$(BROTLI_PATH)/build -S$(BROTLI_PATH) $(CMAKE_OPTS)
 
 installdir/lib/libbrotlidec.so: $(BROTLI_PATH)/build/CMakeCache.txt
 	$(CMAKE) --build $(BROTLI_PATH)/build --target install -j $(NUMBER_OF_PROCESSORS)
@@ -190,7 +190,7 @@ $(OPENAL_PATH)/CMakeLists.txt:
 	git clone --depth 1 -b $(OPENAL_BRANCH) https://github.com/kcat/openal-soft $(OPENAL_PATH)
 
 $(OPENAL_PATH)/build/CMakeCache.txt: $(CMAKE) $(OPENAL_PATH)/CMakeLists.txt
-	$(CMAKE) -B$(OPENAL_PATH)/build -H$(OPENAL_PATH) $(CMAKE_OPTS) -DALSOFT_EXAMPLES=0 -DALSOFT_BACKEND_SNDIO=0
+	$(CMAKE) -B$(OPENAL_PATH)/build -S$(OPENAL_PATH) $(CMAKE_OPTS) -DALSOFT_EXAMPLES=0 -DALSOFT_BACKEND_SNDIO=0
 
 installdir/lib/libopenal.so: $(OPENAL_PATH)/build/CMakeCache.txt
 	$(CMAKE) --build $(OPENAL_PATH)/build --target install -j $(NUMBER_OF_PROCESSORS)

+ 11 - 4
README.md

@@ -1,18 +1,25 @@
 love-appimage-source
 =====
 
-Creates LOVE AppImage by compiling every single dependency from source.
+A Makefile script that builds LÖVE AppImage by compiling every single dependency from source.
 
 Build
 -----
 
-You may want to grab `patchelf` and [all dependencies required by SDL](https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies), but **not** the SDL itself.
+First, install these dependencies (adapt accordingly for non-Debian distro):
 
-Note for Ubuntu ARM64: If APT can't find `libsndio-dev` and `fcitx-libs-dev`, make sure to add `universe` repository!
+```sh
+sudo apt-get install autotools-dev automake autoconf libtool patchelf curl
+```
+
+Then followed by [all dependencies required by SDL](https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies), but **not** the SDL itself.
 
 Afterwards, run `make`. `love-main.AppImage` and `love-main.tar.gz` (by default) will be generated. See the Makefile script for various tweakable variables.
 
-If you're running WSL 1, run with `make QEMU=env` to bypass FUSE requirement restrictions by extrating `appimagetool` first.
+Notes:
+* If you're getting FUSE error in Ubuntu 22.04 or later, install `libfuse2`. Ubuntu 22 start switching to FUSE 3 which is NOT SUPPORTED by AppImage!
+* For Ubuntu ARM64, ff APT can't find `libsndio-dev` and `fcitx-libs-dev`, make sure to add `universe` repository!
+* If you're running WSL 1, run with `make QEMU=env` to bypass FUSE requirement restrictions by extrating `appimagetool` first.
 
 License
 -----