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 04:55:32 UTC
svn commit: r580671 - 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

Author: wrowe
Date: Sat Sep 29 19:55:30 2007
New Revision: 580671

URL: http://svn.apache.org/viewvc?rev=580671&view=rev
Log:
Revert much of the previous approach, RSC and custom MAKE lines
don't actually substitute $(FooDir) parameters.  We'll be tweaking
things to peek at the INTDIR and OUTDIR make files when invoked
via the Studio.

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

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=580671&r1=580670&r2=580671&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ccs/apriconv_ccs_modules.dsp (original)
+++ apr/apr-iconv/trunk/ccs/apriconv_ccs_modules.dsp Sat Sep 29 19:55:30 2007
@@ -32,85 +32,85 @@
 
 # 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)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Output_Dir "..\LibR\iconv"
+# PROP BASE Intermediate_Dir "LibR"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
 # 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)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Output_Dir "..\LibR\iconv"
+# PROP Intermediate_Dir "LibR"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "LibR"
+# PROP Target_File "Buildmark.ccs"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\LibR\iconv"
 
 !ELSEIF  "$(CFG)" == "apriconv_ccs_modules - Win32 Debug"
 
 # 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)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Output_Dir "..\LibD\iconv"
+# PROP BASE Intermediate_Dir "LibD"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
 # 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)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Output_Dir "..\LibD\iconv"
+# PROP Intermediate_Dir "LibD"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "LibD"
+# PROP Target_File "Buildmark.ccs"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\LibD\iconv"
 
 !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 Output_Dir "..\LibR\iconv"
+# PROP BASE Intermediate_Dir "LibRNT"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
 # 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 Output_Dir "..\LibR\iconv"
+# PROP Intermediate_Dir "LibRNT"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "LibR"
+# PROP Target_File "Buildmark.ccs"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\LibR\iconv"
 
 !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 Output_Dir "..\LibD\iconv"
+# PROP BASE Intermediate_Dir "LibDNT"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
 # 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 Output_Dir "..\LibD\iconv"
+# PROP Intermediate_Dir "LibDNT"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "LibD"
+# PROP Target_File "Buildmark.ccs"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\LibD\iconv"
 
 !ENDIF 
 

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=580671&r1=580670&r2=580671&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ccs/libapriconv_ccs_modules.dsp (original)
+++ apr/apr-iconv/trunk/ccs/libapriconv_ccs_modules.dsp Sat Sep 29 19:55:30 2007
@@ -32,85 +32,85 @@
 
 # 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)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Output_Dir "..\Release\iconv"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # 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\iconv"
-# 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 Output_Dir "..\Release\iconv"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Release"
+# PROP Target_File "Buildmark.ccs"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\Release\iconv"
 
 !ELSEIF  "$(CFG)" == "libapriconv_ccs_modules - Win32 Debug"
 
 # 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)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Output_Dir "..\Debug\iconv"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # 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\iconv"
-# 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 Output_Dir "..\Debug\iconv"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug"
+# PROP Target_File "Buildmark.ccs"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\Debug\iconv"
 
 !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 Output_Dir "..\Release\iconv"
+# PROP BASE Intermediate_Dir "ReleaseNT"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # 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 Output_Dir "..\Release\iconv"
+# PROP Intermediate_Dir "ReleaseNT"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Release"
+# PROP Target_File "Buildmark.ccs"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\Release\iconv"
 
 !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 Output_Dir "..\Debug\iconv"
+# PROP BASE Intermediate_Dir "DebugNT"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # 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 Output_Dir "..\Debug\iconv"
+# PROP Intermediate_Dir "DebugNT"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug"
+# PROP Target_File "Buildmark.ccs"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\Debug\iconv"
 
 !ENDIF 
 

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=580671&r1=580670&r2=580671&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/apriconv_ces_modules.dsp (original)
+++ apr/apr-iconv/trunk/ces/apriconv_ces_modules.dsp Sat Sep 29 19:55:30 2007
@@ -32,85 +32,85 @@
 
 # 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)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Output_Dir "..\LibR\iconv"
+# PROP BASE Intermediate_Dir "LibR"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
 # 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)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Output_Dir "..\LibR\iconv"
+# PROP Intermediate_Dir "LibR"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "LibR"
+# PROP Target_File "Buildmark.ces"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\LibR\iconv"
 
 !ELSEIF  "$(CFG)" == "apriconv_ces_modules - Win32 Debug"
 
 # 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)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Output_Dir "..\LibD\iconv"
+# PROP BASE Intermediate_Dir "LibD"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
 # 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)\apr-1.lib ..\$(OutDir)\apriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Output_Dir "..\LibD\iconv"
+# PROP Intermediate_Dir "LibD"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "LibD"
+# PROP Target_File "Buildmark.ces"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\LibD\iconv"
 
 !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 Output_Dir "..\LibR\iconv"
+# PROP BASE Intermediate_Dir "LibRNT"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
 # 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 Output_Dir "..\LibR\iconv"
+# PROP Intermediate_Dir "LibRNT"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=static"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "LibR"
+# PROP Target_File "Buildmark.ces"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\LibR\iconv"
 
 !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 Output_Dir "..\LibD\iconv"
+# PROP BASE Intermediate_Dir "LibDNT"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
 # 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 Output_Dir "..\LibD\iconv"
 # 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 Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "LibD"
+# PROP Target_File "Buildmark.ces"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\LibD\iconv"
 
 !ENDIF 
 

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=580671&r1=580670&r2=580671&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/libapriconv_ces_modules.dsp (original)
+++ apr/apr-iconv/trunk/ces/libapriconv_ces_modules.dsp Sat Sep 29 19:55:30 2007
@@ -32,85 +32,85 @@
 
 # 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)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Output_Dir "..\Release\iconv"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # 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)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Output_Dir "..\Release\iconv"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Release"
+# PROP Target_File "Buildmark.ces"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\Release\iconv"
 
 !ELSEIF  "$(CFG)" == "libapriconv_ces_modules - Win32 Debug"
 
 # 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)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP BASE Output_Dir "..\Debug\iconv"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # 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)\libapr-1.lib ..\$(OutDir)\libapriconv-1.lib" CFG_OUTPUT="$(IntDir)" OUTPUT_DIR="..\$(IntDir)""
+# PROP Output_Dir "..\Debug\iconv"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug"
+# PROP Target_File "Buildmark.ces"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\Debug\iconv"
 
 !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 Output_Dir "..\Release\iconv"
+# PROP BASE Intermediate_Dir "ReleaseNT"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # 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 Output_Dir "..\Release\iconv"
+# PROP Intermediate_Dir "ReleaseNT"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Release"
+# PROP Target_File "Buildmark.ces"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\Release\iconv"
 
 !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 Output_Dir "..\Debug\iconv"
+# PROP BASE Intermediate_Dir "DebugNT"
+# PROP BASE Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # 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 Output_Dir "..\Debug\iconv"
+# PROP Intermediate_Dir "DebugNT"
+# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Debug"
+# PROP Target_File "Buildmark.ces"
 # PROP Bsc_Name ""
-# PROP Target_Dir ""
+# PROP Target_Dir "..\Debug\iconv"
 
 !ENDIF