diff --git a/Makefile b/Makefile index 931106a..c3c1ce7 100644 --- a/Makefile +++ b/Makefile @@ -38,4 +38,4 @@ clean: $(MAKE) -C ./Module $(FLAGS) clean $(MAKE) -C ./Common $(FLAGS) clean $(MAKE) -C ./Manpage $(FLAGS) clean - rm -f ./Server/option + rm -f ./Server/option install-*ssl.exe diff --git a/config.h b/config.h.tmpl similarity index 87% rename from config.h rename to config.h.tmpl index 7d9d770..c00b7a8 100644 --- a/config.h +++ b/config.h.tmpl @@ -12,3 +12,7 @@ #endif #endif + +/* +vim: syntax=c +*/ diff --git a/installer.sh b/installer.sh index b830ee2..5461ec9 100755 --- a/installer.sh +++ b/installer.sh @@ -4,11 +4,14 @@ fail() { rm -f tewi-service.exe rm -f tewi.exe + mv config.h.bak config.h exit 1 } VERSION=`make get-version` +sed "s/undef NO_SSL/define NO_SSL/g" config.h.tmpl > config.h + make clean || fail make PLATFORM=$1 -j4 || fail cp Server/tewi.exe tewi.exe @@ -17,5 +20,20 @@ make PLATFORM=$1-service -j4 || fail cp Server/tewi.exe tewi-service.exe cd Server makensis -DVERSION=$VERSION install.nsi +cp install.exe ../install-nossl.exe +rm -f tewi.exe tewi-service.exe +cd .. + +sed "s/define NO_SSL/undef NO_SSL/g" config.h.tmpl > config.h + +make clean || fail +make PLATFORM=$1 -j4 || fail +cp Server/tewi.exe tewi.exe +make clean || fail +make PLATFORM=$1-service -j4 || fail +cp Server/tewi.exe tewi-service.exe +cd Server +makensis -DVERSION=$VERSION install.nsi +cp install.exe ../install-ssl.exe rm -f tewi.exe tewi-service.exe cd ..