diff --git a/Makefile b/Makefile index 720f0ff..43d99bf 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ endif ifneq (,$(firstword $(filter %mingw32 %-windows-gnu %-cygwin %-cygnus,$(MACHINE)))) EXE_SUFFIX := .exe - LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),dll,lib) + LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),dll,a) else LIB_SUFFIX := .$(if $(subst 0,,$(SHARED)),$(if $(findstring -apple-darwin,$(MACHINE)),dylib,so),a) endif diff --git a/etc/build/win32/mk-release.sh b/etc/build/win32/mk-release.sh index 1b5de02..46898ca 100755 --- a/etc/build/win32/mk-release.sh +++ b/etc/build/win32/mk-release.sh @@ -23,10 +23,10 @@ fi mk_slunk() { 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 x86_64*) @@ -41,9 +41,9 @@ case "${machine}" in esac if [[ "${machine}" == *"-cygwin" ]]; then - cp -vfu "$(which cygwin1.dll)" "out/_next_" + cp -vfu "$(which cygwin1.dll)" "out" 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."