Argh, I borked the dev@ address ...
-------- Original Message -------- Subject: Re: [PATCH] apr-iconv Windows build tweak (fix?) Date: Tue, 23 Jul 2002 02:21:32 +0200 From: Branko Äibej <[EMAIL PROTECTED]> To: [EMAIL PROTECTED] CC: [EMAIL PROTECTED], "William A. Rowe, Jr." <[EMAIL PROTECTED]> References: <[EMAIL PROTECTED]>
[EMAIL PROTECTED] wrote:
Error: (l)user cmpilato gots no commits bits.
* apr-iconv/apriconv.dsp Use "LibD" and "LibR" output directories (like other APR projects) instead of the default "Debug" and "Release".
Yep, there are a couple more problems there (not the least that libapriconv.dsp creates a static lib, not a DLL). I've fixed those now (patch attached).
Bill, if you've no objections, I'll commit this soon.
-- Brane Äibej http://www.xbc.nu/brane/
-- Brane Äibej <[EMAIL PROTECTED]> http://www.xbc.nu/brane/
* apr-iconv/apriconv.dsp: Put built files in LibR and LibD, for consistency with other APR static library project files. * apr-iconv/libapriconv.dsp: Create a DLL, and put built files into Release and debug, for consistency with other APR DLL project files.
Index: apriconv.dsp =================================================================== RCS file: /home/cvs/apr-iconv/apriconv.dsp,v retrieving revision 1.2 diff -u -p -r1.2 apriconv.dsp --- apriconv.dsp 21 Jul 2002 00:22:19 -0000 1.2 +++ apriconv.dsp 23 Jul 2002 00:14:21 -0000 @@ -32,16 +32,16 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" +# PROP BASE Output_Dir "LibR" +# PROP BASE Intermediate_Dir "LibR" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" +# PROP Output_Dir "LibR" +# PROP Intermediate_Dir "LibR" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "../apr/include" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"Release\apriconv" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "../apr/include" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibR\apriconv" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -55,17 +55,17 @@ LIB32=link.exe -lib # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Output_Dir "LibD" +# PROP BASE Intermediate_Dir "LibD" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" +# PROP Output_Dir "LibD" +# PROP Intermediate_Dir "LibD" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../apr/include" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"Debug\apriconv" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../apr/include" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apriconv" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe Index: libapriconv.dsp =================================================================== RCS file: /home/cvs/apr-iconv/libapriconv.dsp,v retrieving revision 1.2 diff -u -p -r1.2 libapriconv.dsp --- libapriconv.dsp 20 Jul 2002 23:57:26 -0000 1.2 +++ libapriconv.dsp 23 Jul 2002 00:14:21 -0000 @@ -2,7 +2,7 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Static Library" 0x0104 +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 CFG=libapriconv - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, @@ -17,8 +17,8 @@ CFG=libapriconv - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "libapriconv - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libapriconv - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "libapriconv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libapriconv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -26,54 +26,60 @@ CFG=libapriconv - Win32 Debug # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe +MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "libapriconv - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "LibR" -# PROP BASE Intermediate_Dir "LibR" +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "LibR" -# PROP Intermediate_Dir "LibR" +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "../apr/include" /D "NDEBUG" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibR\libapriconv" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "../apr/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_DECLARE_EXPORT" /Fd"Release\apriconv" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EC0000" /subsystem:windows /dll /map /machine:I386 +# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EC0000" /subsystem:windows /dll /map /machine:I386 !ELSEIF "$(CFG)" == "libapriconv - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "LibD" -# PROP BASE Intermediate_Dir "LibD" +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "LibD" -# PROP Intermediate_Dir "LibD" +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../apr/include" /D "_DEBUG" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\libapriconv" /FD /c -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../apr/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_DECLARE_EXPORT" /Fd"Debug\apriconv" /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EC0000" /subsystem:windows /dll /incremental:no /map /debug /machine:I386 +# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EC00000" /subsystem:windows /dll /incremental:no /map /debug /machine:I386 !ENDIF
* apr-util/libaprutil.dsp: Expect to link with the apr-iconv DLL. Index: libaprutil.dsp =================================================================== RCS file: /home/cvs/apr-util/libaprutil.dsp,v retrieving revision 1.40 diff -u -p -r1.40 libaprutil.dsp --- libaprutil.dsp 20 Jul 2002 23:57:26 -0000 1.40 +++ libaprutil.dsp 23 Jul 2002 00:13:43 -0000 @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "API_DECLARE_STATIC" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Release\aprutil" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Release\aprutil" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL" # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /I "./expat/lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_DECLARE_STATIC" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Debug\aprutil" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /I "./expat/lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Debug\aprutil" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL" # ADD BASE RSC /l 0x409 /d "_DEBUG"
