Muldersoft/SlunkCrypt
Muldersoft/SlunkCrypt
1
0
Fork 0
Code Releases 6 Activity

Fixed build with Cygwin and MinGW-w64 when *not* using the "shared" library.

Browse Source
This commit is contained in:
LoRd_MuldeR 2024-11-14 23:14:06 +01:00
parent d0deac3a65
commit b78338dccc
Signed by: mulder
GPG Key ID: 2B5913365F57E03F
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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)

8
etc/build/win32/mk-release.sh
View File

@ -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."