diff options
| -rw-r--r-- | NWGNUmakefile | 5 | ||||
| -rw-r--r-- | build/NWGNUenvironment.inc | 18 |
2 files changed, 12 insertions, 11 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 0cf5e5cb10..3b5fb35304 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -120,11 +120,6 @@ NLM_NAME = Apache2 # This is used by the link '-desc ' directive. # If left blank, NLM_NAME will be used. # -ifdef USE_STDSOCKETS -VERSION_SKT = (BSDSOCK) -else -VERSION_SKT = (WINSOCK) -endif NLM_DESCRIPTION = Apache Web Server $(VERSION_STR) $(VERSION_SKT) # diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 106b82b2a2..b65ad9b96c 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -111,10 +111,10 @@ endif # # MetroWerks NLM tools -CC = mwccnlm -CPP = mwccnlm +CC = mwccnlm +CPP = mwccnlm LINK = mwldnlm -LIB = mwldnlm -type library -w nocmdline +LIB = mwldnlm -type library -w nocmdline ifdef IPV6 ifndef USE_STDSOCKETS @@ -132,12 +132,18 @@ ifneq "$(ZLIBSDK)" "" INCDIRS := $(INCDIRS);$(ZLIBSDK) endif -DEFINES = -DNETWARE +DEFINES = -DNETWARE ifndef USE_STDSOCKETS -DEFINES += -DUSE_WINSOCK +DEFINES += -DUSE_WINSOCK endif ifndef DEBUG -DEFINES += -DNDEBUG +DEFINES += -DNDEBUG +endif + +ifdef USE_STDSOCKETS +VERSION_SKT = (BSDSOCK) +else +VERSION_SKT = (WINSOCK) endif # |