Merge branch 'misc-fixes' into libretro

This commit is contained in:
刘皓 2025-04-11 12:47:05 -04:00
commit c5af94c25a
No known key found for this signature in database
GPG key ID: 7901753DB465B711
3 changed files with 18 additions and 27 deletions

View file

@ -76,19 +76,16 @@ $(DOWNLOADS)/theora/autogen.sh:
# Vorbis
libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a
$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile
cd $(DOWNLOADS)/vorbis; \
$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/cmakebuild/Makefile
cd $(DOWNLOADS)/vorbis/cmakebuild; \
make -j$(NPROC); make install
$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/configure
$(DOWNLOADS)/vorbis/cmakebuild/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt
cd $(DOWNLOADS)/vorbis; \
$(CONFIGURE) --with-ogg=$(BUILD_PREFIX) --enable-shared=false --enable-static=true
mkdir cmakebuild; cd cmakebuild; \
$(CMAKE) -DBUILD_SHARED_LIBS=no
$(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh
cd $(DOWNLOADS)/vorbis; \
./autogen.sh
$(DOWNLOADS)/vorbis/autogen.sh:
$(DOWNLOADS)/vorbis/CMakeLists.txt:
$(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis

View file

@ -79,19 +79,16 @@ $(DOWNLOADS)/theora/autogen.sh:
# Vorbis
libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a
$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile
cd $(DOWNLOADS)/vorbis; \
$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/cmakebuild/Makefile
cd $(DOWNLOADS)/vorbis/cmakebuild; \
make -j$(NPROC); make install
$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/configure
$(DOWNLOADS)/vorbis/cmakebuild/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt
cd $(DOWNLOADS)/vorbis; \
$(CONFIGURE) --with-ogg=$(BUILD_PREFIX) --enable-shared=false --enable-static=true
mkdir cmakebuild; cd cmakebuild; \
$(CMAKE) -DBUILD_SHARED_LIBS=no
$(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh
cd $(DOWNLOADS)/vorbis; \
./autogen.sh
$(DOWNLOADS)/vorbis/autogen.sh:
$(DOWNLOADS)/vorbis/CMakeLists.txt:
$(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis

View file

@ -71,19 +71,16 @@ $(DOWNLOADS)/theora/autogen.sh:
# Vorbis
libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a
$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile
cd $(DOWNLOADS)/vorbis; \
$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/cmakebuild/Makefile
cd $(DOWNLOADS)/vorbis/cmakebuild; \
make -j$(NPROC); make install
$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/configure
$(DOWNLOADS)/vorbis/cmakebuild/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt
cd $(DOWNLOADS)/vorbis; \
$(CONFIGURE) --with-ogg=$(BUILD_PREFIX) --enable-shared=false --enable-static=true
mkdir cmakebuild; cd cmakebuild; \
$(CMAKE) -DBUILD_SHARED_LIBS=no
$(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh
cd $(DOWNLOADS)/vorbis; \
./autogen.sh
$(DOWNLOADS)/vorbis/autogen.sh:
$(DOWNLOADS)/vorbis/CMakeLists.txt:
$(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis