Deleted Added
full compact
Makefile.win (253734) Makefile.win (272076)
1# PROGRAMS
2# test programs invoked via standard user interface, run on all platforms
3# ALL_TESTS
4# test modules invoked through the abts suite (./testall)
5# OTHER_PROGRAMS
6# programs such as sendfile, that have to be invoked in a special sequence
7# or with special parameters
8

--- 74 unchanged lines hidden (view full) ---

83APR_PATH = ..\..\apr
84API_PATH = ..\..\apr-iconv
85
86APROUTDIR=$(OUTDIR)
87
88!IF "$(MODEL)" == "static"
89PROGRAM_DEPENDENCIES = \
90 $(APR_PATH)\$(APROUTDIR)\apr-1.lib \
1# PROGRAMS
2# test programs invoked via standard user interface, run on all platforms
3# ALL_TESTS
4# test modules invoked through the abts suite (./testall)
5# OTHER_PROGRAMS
6# programs such as sendfile, that have to be invoked in a special sequence
7# or with special parameters
8

--- 74 unchanged lines hidden (view full) ---

83APR_PATH = ..\..\apr
84API_PATH = ..\..\apr-iconv
85
86APROUTDIR=$(OUTDIR)
87
88!IF "$(MODEL)" == "static"
89PROGRAM_DEPENDENCIES = \
90 $(APR_PATH)\$(APROUTDIR)\apr-1.lib \
91 $(API_PATH)\$(OUTDIR)\apriconv-1.lib \
92 ..\xml\expat\lib\$(OUTDIR)\xml.lib \
91 ..\$(OUTDIR)\aprutil-1.lib
92STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
93STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib
94!ELSE
95PROGRAM_DEPENDENCIES = \
96 $(APR_PATH)\$(APROUTDIR)\libapr-1.lib \
97 ..\$(OUTDIR)\libaprutil-1.lib
98STATIC_CFLAGS =

--- 71 unchanged lines hidden ---
93 ..\$(OUTDIR)\aprutil-1.lib
94STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC
95STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib
96!ELSE
97PROGRAM_DEPENDENCIES = \
98 $(APR_PATH)\$(APROUTDIR)\libapr-1.lib \
99 ..\$(OUTDIR)\libaprutil-1.lib
100STATIC_CFLAGS =

--- 71 unchanged lines hidden ---