You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2007/09/30 02:29:31 UTC
svn commit: r580657 - in /apr/apr-iconv/trunk: ccs/apriconv_ccs_modules.dsp
ccs/libapriconv_ccs_modules.dsp ces/apriconv_ces_modules.dsp
ces/libapriconv_ces_modules.dsp libapriconv.dsp
Author: wrowe
Date: Sat Sep 29 17:29:30 2007
New Revision: 580657
URL: http://svn.apache.org/viewvc?rev=580657&view=rev
Log:
In order to provide an easier VStudio .vcproj file transition
replace most path occurances with $(IntDir)/$(OutDir) substitutions.
Use the Debug|ReleaseNT (renamed) Lib[RD]NT directories when building
an NT-specific target; note that other than the origin of the link to
[lib]apr-1.lib, there's no other difference between these targets.
This simply allows us to link against NT-specific builds.
Note an NT-linked libapriconv or it's iconv .so code pages will load
just as easily against the non-NT libapr.dll, there's no difference
at runtime.
Modified:
apr/apr-iconv/trunk/ccs/apriconv_ccs_modules.dsp
apr/apr-iconv/trunk/ccs/libapriconv_ccs_modules.dsp
apr/apr-iconv/trunk/ces/apriconv_ces_modules.dsp
apr/apr-iconv/trunk/ces/libapriconv_ces_modules.dsp
apr/apr-iconv/trunk/libapriconv.dsp
Modified: apr/apr-iconv/trunk/ccs/apriconv_ccs_modules.dsp
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ccs/apriconv_ccs_modules.dsp?rev=580657&r1=580656&r2=580657&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ccs/apriconv_ccs_modules.dsp (original)
+++ apr/apr-iconv/trunk/ccs/apriconv_ccs_modules.dsp Sat Sep 29 17:29:30 2007
@@ -19,6 +19,8 @@
!MESSAGE
!MESSAGE "apriconv_ccs_modules - Win32 Release" (based on "Win32 (x86) External Target")
!MESSAGE "apriconv_ccs_modules - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE "apriconv_ccs_modules - Win32 ReleaseNT" (based on "Win32 (x86) External Target")
+!MESSAGE "apriconv_ccs_modules - Win32 DebugNT" (based on "Win32 (x86) External Target")
!MESSAGE
# Begin Project
@@ -30,20 +32,20 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\Release\iconv"
-# PROP BASE Intermediate_Dir "..\Release\iconv"
-# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
+# PROP BASE Output_Dir "LibR"
+# PROP BASE Intermediate_Dir "..\LibR\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "apriconv_ccs_modules.exe"
# PROP BASE Bsc_Name "apriconv_ccs_modules.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Release\iconv"
-# PROP Intermediate_Dir "..\Release\iconv"
-# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
+# PROP Output_Dir "LibR"
+# PROP Intermediate_Dir "..\LibR\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP Rebuild_Opt "/a"
-# PROP Target_File "Release"
+# PROP Target_File "LibR"
# PROP Bsc_Name ""
# PROP Target_Dir ""
@@ -51,20 +53,62 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\Debug\iconv"
-# PROP BASE Intermediate_Dir "..\Debug\iconv"
-# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
+# PROP BASE Output_Dir "LibD"
+# PROP BASE Intermediate_Dir "..\LibD\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "apriconv_ccs_modules.exe"
# PROP BASE Bsc_Name "apriconv_ccs_modules.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Debug\iconv"
-# PROP Intermediate_Dir "..\Debug\iconv"
-# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
+# PROP Output_Dir "LibD"
+# PROP Intermediate_Dir "..\LibD\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug"
+# PROP Target_File "LibD"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "apriconv_ccs_modules - Win32 ReleaseNT"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "LibR"
+# PROP BASE Intermediate_Dir "..\LibR\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)NT\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "apriconv_ccs_modules.exe"
+# PROP BASE Bsc_Name "apriconv_ccs_modules.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "LibR"
+# PROP Intermediate_Dir "..\LibR\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)NT\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "LibR"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "apriconv_ccs_modules - Win32 DebugNT"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "LibD"
+# PROP BASE Intermediate_Dir "..\LibD\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)NT\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "apriconv_ccs_modules.exe"
+# PROP BASE Bsc_Name "apriconv_ccs_modules.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "LibD"
+# PROP Intermediate_Dir "..\LibD\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)NT\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "LibD"
# PROP Bsc_Name ""
# PROP Target_Dir ""
@@ -74,12 +118,8 @@
# Name "apriconv_ccs_modules - Win32 Release"
# Name "apriconv_ccs_modules - Win32 Debug"
-
-!IF "$(CFG)" == "apriconv_ccs_modules - Win32 Release"
-
-!ELSEIF "$(CFG)" == "apriconv_ccs_modules - Win32 Debug"
-
-!ENDIF
+# Name "apriconv_ccs_modules - Win32 ReleaseNT"
+# Name "apriconv_ccs_modules - Win32 DebugNT"
# Begin Group "Source Files"
Modified: apr/apr-iconv/trunk/ccs/libapriconv_ccs_modules.dsp
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ccs/libapriconv_ccs_modules.dsp?rev=580657&r1=580656&r2=580657&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ccs/libapriconv_ccs_modules.dsp (original)
+++ apr/apr-iconv/trunk/ccs/libapriconv_ccs_modules.dsp Sat Sep 29 17:29:30 2007
@@ -19,6 +19,8 @@
!MESSAGE
!MESSAGE "libapriconv_ccs_modules - Win32 Release" (based on "Win32 (x86) External Target")
!MESSAGE "libapriconv_ccs_modules - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE "libapriconv_ccs_modules - Win32 ReleaseNT" (based on "Win32 (x86) External Target")
+!MESSAGE "libapriconv_ccs_modules - Win32 DebugNT" (based on "Win32 (x86) External Target")
!MESSAGE
# Begin Project
@@ -30,18 +32,18 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\Release\iconv"
+# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "..\Release\iconv"
-# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "libapriconv_ccs_modules.exe"
# PROP BASE Bsc_Name "libapriconv_ccs_modules.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Release\iconv"
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "..\Release\iconv"
-# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP Rebuild_Opt "/a"
# PROP Target_File "Release"
# PROP Bsc_Name ""
@@ -51,18 +53,60 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\Debug\iconv"
+# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "..\Debug\iconv"
-# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "libapriconv_ccs_modules.exe"
# PROP BASE Bsc_Name "libapriconv_ccs_modules.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Debug\iconv"
+# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "..\Debug\iconv"
-# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "Debug"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "libapriconv_ccs_modules - Win32 ReleaseNT"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "..\Release\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)NT\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "libapriconv_ccs_modules.exe"
+# PROP BASE Bsc_Name "libapriconv_ccs_modules.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "..\Release"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)NT\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "Release"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "libapriconv_ccs_modules - Win32 DebugNT"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "..\Debug\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)NT\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "libapriconv_ccs_modules.exe"
+# PROP BASE Bsc_Name "libapriconv_ccs_modules.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "..\Debug"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)NT\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP Rebuild_Opt "/a"
# PROP Target_File "Debug"
# PROP Bsc_Name ""
@@ -74,12 +118,8 @@
# Name "libapriconv_ccs_modules - Win32 Release"
# Name "libapriconv_ccs_modules - Win32 Debug"
-
-!IF "$(CFG)" == "libapriconv_ccs_modules - Win32 Release"
-
-!ELSEIF "$(CFG)" == "libapriconv_ccs_modules - Win32 Debug"
-
-!ENDIF
+# Name "libapriconv_ccs_modules - Win32 ReleaseNT"
+# Name "libapriconv_ccs_modules - Win32 DebugNT"
# Begin Group "Source Files"
Modified: apr/apr-iconv/trunk/ces/apriconv_ces_modules.dsp
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/apriconv_ces_modules.dsp?rev=580657&r1=580656&r2=580657&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/apriconv_ces_modules.dsp (original)
+++ apr/apr-iconv/trunk/ces/apriconv_ces_modules.dsp Sat Sep 29 17:29:30 2007
@@ -19,6 +19,8 @@
!MESSAGE
!MESSAGE "apriconv_ces_modules - Win32 Release" (based on "Win32 (x86) External Target")
!MESSAGE "apriconv_ces_modules - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE "apriconv_ces_modules - Win32 ReleaseNT" (based on "Win32 (x86) External Target")
+!MESSAGE "apriconv_ces_modules - Win32 DebugNT" (based on "Win32 (x86) External Target")
!MESSAGE
# Begin Project
@@ -30,20 +32,20 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\Release\iconv"
-# PROP BASE Intermediate_Dir "..\Release\iconv"
-# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
+# PROP BASE Output_Dir "LibR"
+# PROP BASE Intermediate_Dir "..\LibR\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "apriconv_ces_modules.exe"
# PROP BASE Bsc_Name "apriconv_ces_modules.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Release\iconv"
-# PROP Intermediate_Dir "..\Release\iconv"
-# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
+# PROP Output_Dir "LibR"
+# PROP Intermediate_Dir "..\LibR\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP Rebuild_Opt "/a"
-# PROP Target_File "Release"
+# PROP Target_File "LibR"
# PROP Bsc_Name ""
# PROP Target_Dir ""
@@ -51,20 +53,62 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\Debug\iconv"
-# PROP BASE Intermediate_Dir "..\Debug\iconv"
-# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
+# PROP BASE Output_Dir "LibD"
+# PROP BASE Intermediate_Dir "..\LibD\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "apriconv_ces_modules.exe"
# PROP BASE Bsc_Name "apriconv_ces_modules.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Debug\iconv"
-# PROP Intermediate_Dir "..\Debug\iconv"
-# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
+# PROP Output_Dir "LibD"
+# PROP Intermediate_Dir "..\LibD\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug"
+# PROP Target_File "LibD"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "apriconv_ces_modules - Win32 ReleaseNT"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "LibR"
+# PROP BASE Intermediate_Dir "..\LibR\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)NT\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "apriconv_ces_modules.exe"
+# PROP BASE Bsc_Name "apriconv_ces_modules.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "LibR"
+# PROP Intermediate_Dir "..\LibR\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)NT\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "LibR"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "apriconv_ces_modules - Win32 DebugNT"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "LibD"
+# PROP BASE Intermediate_Dir "..\LibD\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)NT\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "apriconv_ces_modules.exe"
+# PROP BASE Bsc_Name "apriconv_ces_modules.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "LibD"
+# PROP Intermediate_Dir "..\LibD\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static API_LIBS="..\..\apr\$(OutDir)NT\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "LibD"
# PROP Bsc_Name ""
# PROP Target_Dir ""
@@ -74,12 +118,8 @@
# Name "apriconv_ces_modules - Win32 Release"
# Name "apriconv_ces_modules - Win32 Debug"
-
-!IF "$(CFG)" == "apriconv_ces_modules - Win32 Release"
-
-!ELSEIF "$(CFG)" == "apriconv_ces_modules - Win32 Debug"
-
-!ENDIF
+# Name "apriconv_ces_modules - Win32 ReleaseNT"
+# Name "apriconv_ces_modules - Win32 DebugNT"
# Begin Group "Source Files"
Modified: apr/apr-iconv/trunk/ces/libapriconv_ces_modules.dsp
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/ces/libapriconv_ces_modules.dsp?rev=580657&r1=580656&r2=580657&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/libapriconv_ces_modules.dsp (original)
+++ apr/apr-iconv/trunk/ces/libapriconv_ces_modules.dsp Sat Sep 29 17:29:30 2007
@@ -19,6 +19,8 @@
!MESSAGE
!MESSAGE "libapriconv_ces_modules - Win32 Release" (based on "Win32 (x86) External Target")
!MESSAGE "libapriconv_ces_modules - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE "libapriconv_ces_modules - Win32 ReleaseNT" (based on "Win32 (x86) External Target")
+!MESSAGE "libapriconv_ces_modules - Win32 DebugNT" (based on "Win32 (x86) External Target")
!MESSAGE
# Begin Project
@@ -28,20 +30,20 @@
!IF "$(CFG)" == "libapriconv_ces_modules - Win32 Release"
-# PROP BASE Use_MFC
+# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\Release\iconv"
+# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "..\Release\iconv"
-# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "libapriconv_ces_modules.exe"
# PROP BASE Bsc_Name "libapriconv_ces_modules.bsc"
# PROP BASE Target_Dir ""
-# PROP Use_MFC
+# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\Release\iconv"
+# PROP Output_Dir "Release"
# PROP Intermediate_Dir "..\Release\iconv"
-# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP Rebuild_Opt "/a"
# PROP Target_File "Release"
# PROP Bsc_Name ""
@@ -49,20 +51,62 @@
!ELSEIF "$(CFG)" == "libapriconv_ces_modules - Win32 Debug"
-# PROP BASE Use_MFC
+# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\Debug\iconv"
+# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "..\Debug\iconv"
-# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "libapriconv_ces_modules.exe"
# PROP BASE Bsc_Name "libapriconv_ces_modules.bsc"
# PROP BASE Target_Dir ""
-# PROP Use_MFC
+# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\Debug\iconv"
+# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "..\Debug\iconv"
-# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "Debug"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "libapriconv_ces_modules - Win32 ReleaseNT"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "..\Release\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)NT\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "libapriconv_ces_modules.exe"
+# PROP BASE Bsc_Name "libapriconv_ces_modules.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "..\Release\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)NT\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "Release"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF "$(CFG)" == "libapriconv_ces_modules - Win32 DebugNT"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "..\Debug\iconv"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)NT\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "libapriconv_ces_modules.exe"
+# PROP BASE Bsc_Name "libapriconv_ces_modules.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "..\Debug\iconv"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared API_LIBS="..\..\apr\$(OutDir)NT\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
# PROP Rebuild_Opt "/a"
# PROP Target_File "Debug"
# PROP Bsc_Name ""
@@ -74,12 +118,8 @@
# Name "libapriconv_ces_modules - Win32 Release"
# Name "libapriconv_ces_modules - Win32 Debug"
-
-!IF "$(CFG)" == "libapriconv_ces_modules - Win32 Release"
-
-!ELSEIF "$(CFG)" == "libapriconv_ces_modules - Win32 Debug"
-
-!ENDIF
+# Name "libapriconv_ces_modules - Win32 ReleaseNT"
+# Name "libapriconv_ces_modules - Win32 DebugNT"
# Begin Group "Source Files"
Modified: apr/apr-iconv/trunk/libapriconv.dsp
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/libapriconv.dsp?rev=580657&r1=580656&r2=580657&view=diff
==============================================================================
--- apr/apr-iconv/trunk/libapriconv.dsp (original)
+++ apr/apr-iconv/trunk/libapriconv.dsp Sat Sep 29 17:29:30 2007
@@ -53,9 +53,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:"$(OutDir)\libapriconv-1.dll" /opt:ref
# Begin Special Build Tool
-TargetPath=.\Release\libapriconv-1.dll
+TargetPath=$(OutDir)\libapriconv-1.dll
SOURCE="$(InputPath)"
PostBuild_Desc=Embed .manifest
PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2
@@ -85,9 +85,9 @@
# 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:"$(OutDir)\libapriconv-1.dll"
# Begin Special Build Tool
-TargetPath=.\Debug\libapriconv-1.dll
+TargetPath=$(OutDir)\libapriconv-1.dll
SOURCE="$(InputPath)"
PostBuild_Desc=Embed .manifest
PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2