github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-05-05 15:33:34 +00:00
Code Releases Activity

makefile: support more robust builds under Android termux

Browse Source
This commit is contained in:
Mark Pizzolato
2024-06-21 11:37:04 -10:00
parent cc2a00364f
commit ebe8fe80c9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
makefile
View File

@@ -274,10 +274,12 @@ endif
ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,apt-get))) ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,apt-get)))
ifneq (Android,$(shell uname -o)) ifneq (Android,$(shell uname -o))
PKG_MGR = APT PKG_MGR = APT
PKG_CMD = apt-get install
else else
PKG_MGR = TERMUX PKG_MGR = TERMUX
PKG_CMD = pkg install
PKG_NO_SUDO = YES
endif endif
PKG_CMD = apt-get install
endif endif
ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,yum))) ifneq (,$(and $(findstring Linux,$(OSTYPE)),$(call find_exe,yum)))
PKG_MGR = YUM PKG_MGR = YUM
@@ -323,7 +325,7 @@ DPKG_ZLIB = 8
DPKG_SDL_TTF = 9 DPKG_SDL_TTF = 9
DPKG_GMAKE = 10 DPKG_GMAKE = 10
ifneq (3,${SIM_MAJOR}) ifneq (3,${SIM_MAJOR})
# Platform Pkg Names COMPILER PCAP VDE PCRE EDITLINE SDL PNG ZLIB SDL_TTF GMAKE CURL # Platform Pkg Names COMPILER PCAP VDE PCRE EDITLINE SDL PNG ZLIB SDL_TTF GMAKE CURL
PKGS_SRC_HOMEBREW = - - vde pcre libedit sdl2 libpng zlib sdl2_ttf make - PKGS_SRC_HOMEBREW = - - vde pcre libedit sdl2 libpng zlib sdl2_ttf make -
PKGS_SRC_MACPORTS = - - vde2 pcre libedit libsdl2 libpng zlib libsdl2_ttf gmake - PKGS_SRC_MACPORTS = - - vde2 pcre libedit libsdl2 libpng zlib libsdl2_ttf gmake -
PKGS_SRC_APT = gcc libpcap-dev libvdeplug-dev libpcre3-dev libedit-dev libsdl2-dev libpng-dev - libsdl2-ttf-dev - curl PKGS_SRC_APT = gcc libpcap-dev libvdeplug-dev libpcre3-dev libedit-dev libsdl2-dev libpng-dev - libsdl2-ttf-dev - curl
@@ -333,7 +335,7 @@ ifneq (3,${SIM_MAJOR})
PKGS_SRC_PKGSRC = - - - pcre editline SDL2 png zlib SDL2_ttf gmake - PKGS_SRC_PKGSRC = - - - pcre editline SDL2 png zlib SDL2_ttf gmake -
PKGS_SRC_PKGBSD = - - - pcre libedit sdl2 png - sdl2_ttf gmake - PKGS_SRC_PKGBSD = - - - pcre libedit sdl2 png - sdl2_ttf gmake -
PKGS_SRC_PKGADD = - - - pcre - sdl2 png - sdl2-ttf gmake - PKGS_SRC_PKGADD = - - - pcre - sdl2 png - sdl2-ttf gmake -
PKGS_SRC_TERMUX = - libpcap - - - sdl2 - - - - - PKGS_SRC_TERMUX = clang libpcap - pcre - - - - - - curl
ifneq (0,$(TESTS)) ifneq (0,$(TESTS))
ifneq (,${TEST_ARG}) ifneq (,${TEST_ARG})
export TEST_ARG export TEST_ARG