diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-15 21:45:45 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-15 21:45:45 +0000 |
| commit | d33bd1e7d457f2e9ff5f473a37ef458d128ef710 (patch) | |
| tree | a2baa1c208fe3fd117a8890e48d6a5f4d41ca839 | |
| parent | 763203d13357718e3d7d1549b52a18fe963cc7ef (diff) | |
| download | libapr-util-d33bd1e7d457f2e9ff5f473a37ef458d128ef710.tar.gz | |
Static builds require linking against odbc still
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@686379 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | test/Makefile.win | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/Makefile.win b/test/Makefile.win index 3ad98dd3..c1c85336 100644 --- a/test/Makefile.win +++ b/test/Makefile.win @@ -89,11 +89,14 @@ PROGRAM_DEPENDENCIES = \ $(APR_PATH)\$(APROUTDIR)\apr-1.lib \ ..\$(OUTDIR)\aprutil-1.lib STATIC_CFLAGS = /D APR_DECLARE_STATIC /D APU_DECLARE_STATIC +STATIC_LIBS = odbc32.lib odbccp32.lib wldap32.lib !ELSE PROGRAM_DEPENDENCIES = \ $(APR_PATH)\$(APROUTDIR)\libapr-1.lib \ ..\$(OUTDIR)\libaprutil-1.lib -STATIC_CFLAGS = +STATIC_CFLAGS = +# APR 1.3 doesn't fully abstract ldap_ calls to permit switching providers; +STATIC_LIBS = wldap32.lib !ENDIF !IFDEF _DEBUG @@ -109,7 +112,7 @@ CFLAGS = /nologo /c /W3 /Gm /EHsc /Zi /Od $(INCLUDES) \ /D _DEBUG /D WIN32 /Fo"$(INTDIR)/" /FD LD_LIBS = kernel32.lib advapi32.lib ws2_32.lib wsock32.lib \ - ole32.lib shell32.lib rpcrt4.lib wldap32.lib + ole32.lib shell32.lib rpcrt4.lib $(STATIC_LIBS) LDFLAGS = /nologo /debug /subsystem:console /incremental:no SHLDFLAGS = /nologo /dll /debug /subsystem:windows /incremental:no |