Commit 8db60dd5 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

NetWare build system: added vars for Linux build. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1333556 13f79535-47bb-0310-9956-ffa450edef68
parent 9f1da569

build/NWGNUenvironment.inc

+13 −6
Original line number Diff line number Diff line
@@ -201,12 +201,19 @@ CLIB3S = $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/Runtime/mwcrt 
MATH3S	=

PLIB3S	= $(METROWERKS)/Novell Support/Metrowerks Support/Libraries/MSL C++/MWCPP.lib



# MetroWerks Win32 build flags to create build tool

ifeq "$(OS)" "Windows_NT"

# MetroWerks Win32 build flags to create build tools

MWCW_MSL         = "$(METROWERKS)/MSL"

MWCW_W32         = "$(METROWERKS)/Win32-x86 Support"

WIN_CFLAGS =  -O2 -gccinc -nodefaults -proc 586 -w off

WIN_CFLAGS += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)

WIN_CFLAGS += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib

CC_FOR_BUILD     = $(WIN_CC)

CFLAGS_FOR_BUILD =  -O2 -gccinc -nodefaults -proc 586 -w off

CFLAGS_FOR_BUILD += -ir $(MWCW_MSL) -ir $(MWCW_W32) -lr $(MWCW_MSL) -lr $(MWCW_W32)

CFLAGS_FOR_BUILD += -lMSL_All_x86.lib -lkernel32.lib -luser32.lib

else

# GNUC build flags to create build tools

CC_FOR_BUILD     = gcc

CFLAGS_FOR_BUILD = -Wall -O2

endif



# Base compile flags

# and prefix or precompiled header added here.

build/NWGNUmakefile

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ $(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c 


%.exe: $(PCRE)/%.c $(PCRE)/config.h $(PCRE)/pcre.h

	@echo Creating Build Helper $@

	@$(WIN_CC) $(WIN_CFLAGS) $< -o $@

	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@



$(NWOS)/test_char.h: gen_test_char.exe $(AP_WORK)/server/gen_test_char.c

	@echo Creating $(subst /,\,$@)
@@ -87,7 +87,7 @@ $(NWOS)/test_char.h: gen_test_char.exe $(AP_WORK)/server/gen_test_char.c 


%.exe: $(AP_WORK)/server/%.c

	@echo Creating Build Helper $@

	@$(WIN_CC) $(WIN_CFLAGS) -DCROSS_COMPILE $< -o $@

	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE $< -o $@



else