diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/NWGNUenvironment.inc | 5 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 2 | ||||
| -rw-r--r-- | build/NWGNUtail.inc | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 15f3b4143a..4bc506ae6b 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -127,6 +127,9 @@ INCDIRS := $(INCDIRS);$(ZLIBSDK) endif DEFINES = -DNETWARE +ifndef USE_STDSOCKETS +DEFINES += -DUSE_WINSOCK +endif # # MetroWerks static Libraries @@ -271,6 +274,7 @@ SERVER = $(AP_WORK)/server SRC = $(AP_WORK) APR = $(APR_WORK) APRUTIL = $(APU_WORK) +APULDAP = $(APU_WORK)/ldap SUPMOD = $(AP_WORK)/support PCRE = $(AP_WORK)/srclib/pcre APRTEST = $(APR_WORK)/test @@ -284,6 +288,7 @@ PREBUILD_INST = $(AP_WORK)\nwprebuild APRLIB = $(APR)/$(OBJDIR)/aprlib.lib APRUTLIB = $(APRUTIL)/$(OBJDIR)/aprutil.lib +APULDAPLIB = $(APULDAP)/$(OBJDIR)/apuldap.lib STMODLIB = $(STDMOD)/$(OBJDIR)/stdmod.lib PCRELIB = $(PCRE)/$(OBJDIR)/pcre.lib NWOSLIB = $(NWOS)/$(OBJDIR)/netware.lib diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index a9205c2ec4..582c2c9332 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -39,7 +39,7 @@ cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NW @echo -EP >> $@ @echo -nosyspath >> $@ @echo -w nocmdline >> $@ - @echo -DNETWARE >> $@ + @echo $(DEFINES) >> $@ @echo -DCORE_PRIVATE >> $@ @echo -I..\include >> $@ @echo -I..\modules\http >> $@ diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc index 861c890ef5..3a44d646f3 100644 --- a/build/NWGNUtail.inc +++ b/build/NWGNUtail.inc @@ -241,6 +241,7 @@ endif ifneq "$(LDAPSDK)" "" @echo -l $(LDAPSDK)/lib/nlm >> $@ endif + @echo -l $(APULDAP)/$(OBJDIR) >> $@ @echo -l $(XML)/$(OBJDIR) >> $@ @echo -nodefaults >> $@ @echo -map $(OBJDIR)\$(NLM_NAME).map>> $@ |