Compare commits
2 Commits
3855a65eed
...
08aaf69262
Author | SHA1 | Date | |
---|---|---|---|
08aaf69262 | |||
b78338dccc |
4
Makefile
4
Makefile
@ -79,7 +79,7 @@ endif
|
|||||||
|
|
||||||
ifneq (,$(firstword $(filter %mingw32 %-windows-gnu %-cygwin %-cygnus,$(MACHINE))))
|
ifneq (,$(firstword $(filter %mingw32 %-windows-gnu %-cygwin %-cygnus,$(MACHINE))))
|
||||||
EXE_SUFFIX := .exe
|
EXE_SUFFIX := .exe
|
||||||
LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),dll,lib)
|
LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),dll,a)
|
||||||
else
|
else
|
||||||
LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),$(if $(findstring -apple-darwin,$(MACHINE)),dylib,so),a)
|
LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),$(if $(findstring -apple-darwin,$(MACHINE)),dylib,so),a)
|
||||||
endif
|
endif
|
||||||
@ -107,7 +107,7 @@ ifneq (,$(firstword $(filter %-pc-haiku %-unknown-haiku,$(MACHINE))))
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
APP_CFLAGS = $(CFLAGS)
|
APP_CFLAGS = $(CFLAGS)
|
||||||
APP_LDFLGS = $(LDFLGS) -L$(SUBDIR_LIB)/lib -l$(VERSION_LIB)
|
APP_LDFLGS = -L$(SUBDIR_LIB)/lib -l$(VERSION_LIB) $(LDFLGS)
|
||||||
LIB_CFLAGS = $(CFLAGS)
|
LIB_CFLAGS = $(CFLAGS)
|
||||||
LIB_LDFLGS = $(LDFLGS)
|
LIB_LDFLGS = $(LDFLGS)
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ set -e
|
|||||||
cd -- "$(dirname -- "${0}")/../../.."
|
cd -- "$(dirname -- "${0}")/../../.."
|
||||||
|
|
||||||
if [ -z "${cc_path}" ]; then
|
if [ -z "${cc_path}" ]; then
|
||||||
cc_path="/usr/pkg/gcc13/bin/gcc"
|
cc_path="/usr/pkg/gcc14/bin/gcc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mk_slunk() {
|
mk_slunk() {
|
||||||
|
@ -3,7 +3,7 @@ set -e
|
|||||||
cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../../.."
|
cd -- "$(dirname -- "${BASH_SOURCE[0]}")/../../.."
|
||||||
|
|
||||||
if [ -z "${cc_path}" ]; then
|
if [ -z "${cc_path}" ]; then
|
||||||
cc_path="/usr/gcc/13/bin/gcc"
|
cc_path="/usr/gcc/14/bin/gcc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mk_slunk() {
|
mk_slunk() {
|
||||||
|
@ -23,10 +23,10 @@ fi
|
|||||||
|
|
||||||
mk_slunk() {
|
mk_slunk() {
|
||||||
make -B CC="${cc_path}" MARCH=${2} MTUNE=${3} STATIC=1 STRIP=1 FLTO=${use_flto}
|
make -B CC="${cc_path}" MARCH=${2} MTUNE=${3} STATIC=1 STRIP=1 FLTO=${use_flto}
|
||||||
cp -vf "frontend/bin/slunkcrypt" "out/_next_/slunkcrypt-${1}"
|
cp -vf "frontend/bin/slunkcrypt" "out/slunkcrypt-${1}"
|
||||||
}
|
}
|
||||||
|
|
||||||
mkdir -p "out/_next_"
|
mkdir -p "out"
|
||||||
|
|
||||||
case "${machine}" in
|
case "${machine}" in
|
||||||
x86_64*)
|
x86_64*)
|
||||||
@ -41,9 +41,9 @@ case "${machine}" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
if [[ "${machine}" == *"-cygwin" ]]; then
|
if [[ "${machine}" == *"-cygwin" ]]; then
|
||||||
cp -vfu "$(which cygwin1.dll)" "out/_next_"
|
cp -vfu "$(which cygwin1.dll)" "out"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
./etc/build/build_info.sh "${cc_path}" > "out/_next_/.build_info"
|
./etc/build/build_info.sh "${cc_path}" > "out/.build_info"
|
||||||
|
|
||||||
echo "Build completed successfully."
|
echo "Build completed successfully."
|
||||||
|
Loading…
Reference in New Issue
Block a user