apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r585660 - in /apr/apr-iconv/trunk: apriconv.dsp libapriconv.dsp
Date Wed, 17 Oct 2007 20:08:12 GMT
Author: wrowe
Date: Wed Oct 17 13:08:11 2007
New Revision: 585660

URL: http://svn.apache.org/viewvc?rev=585660&view=rev
Log:
Add x64 targets to the apriconv library builds

Modified:
    apr/apr-iconv/trunk/apriconv.dsp
    apr/apr-iconv/trunk/libapriconv.dsp

Modified: apr/apr-iconv/trunk/apriconv.dsp
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/apriconv.dsp?rev=585660&r1=585659&r2=585660&view=diff
==============================================================================
--- apr/apr-iconv/trunk/apriconv.dsp (original)
+++ apr/apr-iconv/trunk/apriconv.dsp Wed Oct 17 13:08:11 2007
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=apriconv - Win32 Debug
+CFG=apriconv - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,14 @@
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "apriconv.mak" CFG="apriconv - Win32 Debug"
+!MESSAGE NMAKE /f "apriconv.mak" CFG="apriconv - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "apriconv - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "apriconv - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "apriconv - x64 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "apriconv - x64 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -41,7 +43,7 @@
 # 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 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /D "NDEBUG" /D
"APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fd"LibR\apriconv_src"
/FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /D "NDEBUG" /D
"APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fo"$(INTDIR)\"
/Fd"$(OUTDIR)\apriconv-1" /FD /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -65,7 +67,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /D "_DEBUG" /D "APR_DECLARE_STATIC"
/D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fd"LibD\apriconv_src" /FD /EHsc
/c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /D "_DEBUG" /D "APR_DECLARE_STATIC"
/D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apriconv-1"
/FD /EHsc /c
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
 BSC32=bscmake.exe
@@ -75,12 +77,61 @@
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"LibD\apriconv-1.lib"
 
+!ELSEIF  "$(CFG)" == "apriconv - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\LibR"
+# PROP BASE Intermediate_Dir "x64\LibR"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\LibR"
+# PROP Intermediate_Dir "x64\LibR"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /D "NDEBUG" /D
"APR_DECLARE_STATIC" /D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fo"$(INTDIR)\"
/Fd"$(OUTDIR)\apriconv-1" /FD /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"x64\LibR\apriconv-1.lib"
+
+!ELSEIF  "$(CFG)" == "apriconv - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\LibD"
+# PROP BASE Intermediate_Dir "x64\LibD"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\LibD"
+# PROP Intermediate_Dir "x64\LibD"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /D "_DEBUG" /D "APR_DECLARE_STATIC"
/D "API_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\apriconv-1"
/FD /EHsc /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"x64\LibD\apriconv-1.lib"
+
 !ENDIF 
 
 # Begin Target
 
 # Name "apriconv - Win32 Release"
 # Name "apriconv - Win32 Debug"
+# Name "apriconv - x64 Release"
+# Name "apriconv - x64 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ".c"

Modified: apr/apr-iconv/trunk/libapriconv.dsp
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/libapriconv.dsp?rev=585660&r1=585659&r2=585660&view=diff
==============================================================================
--- apr/apr-iconv/trunk/libapriconv.dsp (original)
+++ apr/apr-iconv/trunk/libapriconv.dsp Wed Oct 17 13:08:11 2007
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=libapriconv - Win32 Debug
+CFG=libapriconv - Win32 Release
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,14 @@
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "libapriconv.mak" CFG="libapriconv - Win32 Debug"
+!MESSAGE NMAKE /f "libapriconv.mak" CFG="libapriconv - Win32 Release"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "libapriconv - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "libapriconv - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libapriconv - x64 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libapriconv - x64 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -43,7 +45,7 @@
 # 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 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /D "NDEBUG" /D
"API_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fd"Release\libapriconv_src" /FD
/c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /D "NDEBUG" /D
"API_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapriconv_src"
/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"
@@ -53,9 +55,9 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows
/dll /incremental:no /debug /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /out:".\Release\libapriconv-1.dll" /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /out:"Release\libapriconv-1.dll" /pdb:"Release\libapriconv-1.pdb" /implib:"Release\libapriconv-1.lib"
/MACHINE:X86 /opt:ref
 # Begin Special Build Tool
-TargetPath=.\Release\libapriconv-1.dll
+TargetPath=Release\libapriconv-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
@@ -75,7 +77,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /D "_DEBUG" /D "API_DECLARE_EXPORT"
/D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fd"Debug\libapriconv_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /D "_DEBUG" /D "API_DECLARE_EXPORT"
/D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapriconv_src" /FD /EHsc
/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"
@@ -85,9 +87,73 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows
/dll /incremental:no /debug
-# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /out:".\Debug\libapriconv-1.dll"
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /out:".\Debug\libapriconv-1.dll" /pdb:"Debug\libapriconv-1.pdb" /implib:"Debug\libapriconv-1.lib"
/MACHINE:X86
 # Begin Special Build Tool
-TargetPath=.\Debug\libapriconv-1.dll
+TargetPath=Debug\libapriconv-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "libapriconv - x64 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x64\Release"
+# PROP BASE Intermediate_Dir "x64\Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x64\Release"
+# PROP Intermediate_Dir "x64\Release"
+# 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 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /D "NDEBUG" /D
"API_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapriconv_src"
/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"
+# ADD RSC /l 0x409 /d "NDEBUG" /d "API_VERSION_ONLY" /I "./include" /I "../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows
/dll /incremental:no /debug /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /out:"x64\Release\libapriconv-1.dll" /pdb:"x64\Release\libapriconv-1.pdb"
/implib:"x64\Release\libapriconv-1.lib" /MACHINE:X64 /opt:ref
+# Begin Special Build Tool
+TargetPath=x64\Release\libapriconv-1.dll
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "libapriconv - x64 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x64\Debug"
+# PROP BASE Intermediate_Dir "x64\Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x64\Debug"
+# PROP Intermediate_Dir "x64\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /D "_DEBUG" /D "API_DECLARE_EXPORT"
/D "WIN32" /D "_WINDOWS" /Yu"iconv.h" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libapriconv_src" /FD /EHsc
/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" /d "API_VERSION_ONLY" /I "./include" /I "../apr/include"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows
/dll /incremental:no /debug
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /out:"x64\Debug\libapriconv-1.dll" /pdb:"x64\Debug\libapriconv-1.pdb"
/implib:"x64\Debug\libapriconv-1.lib" /MACHINE:X64
+# Begin Special Build Tool
+TargetPath=x64\Debug\libapriconv-1.dll
 SOURCE="$(InputPath)"
 PostBuild_Desc=Embed .manifest
 PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
@@ -99,6 +165,8 @@
 
 # Name "libapriconv - Win32 Release"
 # Name "libapriconv - Win32 Debug"
+# Name "libapriconv - x64 Release"
+# Name "libapriconv - x64 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ".c"



Mime
View raw message