apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r582063 - 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
Date Fri, 05 Oct 2007 03:13:31 GMT
Author: wrowe
Date: Thu Oct  4 20:13:31 2007
New Revision: 582063

URL: http://svn.apache.org/viewvc?rev=582063&view=rev
Log:
Revert the rest of 580657 until I'm satisfied that the
entire problem from VS6 to VS2005 is all resolved

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=582063&r1=582062&r2=582063&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ccs/apriconv_ccs_modules.dsp (original)
+++ apr/apr-iconv/trunk/ccs/apriconv_ccs_modules.dsp Thu Oct  4 20:13:31 2007
@@ -19,8 +19,6 @@
 !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
@@ -32,8 +30,8 @@
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\LibR\iconv"
-# PROP BASE Intermediate_Dir "LibR"
+# 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 Rebuild_Opt "/a"
 # PROP BASE Target_File "apriconv_ccs_modules.exe"
@@ -41,20 +39,20 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\LibR\iconv"
-# PROP Intermediate_Dir "LibR"
+# 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 Rebuild_Opt "/a"
-# PROP Target_File "Buildmark.ccs"
+# PROP Target_File "Release"
 # PROP Bsc_Name ""
-# PROP Target_Dir "..\LibR\iconv"
+# PROP Target_Dir ""
 
 !ELSEIF  "$(CFG)" == "apriconv_ccs_modules - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\LibD\iconv"
-# PROP BASE Intermediate_Dir "LibD"
+# 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 Rebuild_Opt "/a"
 # PROP BASE Target_File "apriconv_ccs_modules.exe"
@@ -62,55 +60,13 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\LibD\iconv"
-# PROP Intermediate_Dir "LibD"
+# 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 Rebuild_Opt "/a"
-# PROP Target_File "Buildmark.ccs"
+# PROP Target_File "Debug"
 # PROP Bsc_Name ""
-# 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\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\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 "Buildmark.ccs"
-# PROP Bsc_Name ""
-# 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\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\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 "Buildmark.ccs"
-# PROP Bsc_Name ""
-# PROP Target_Dir "..\LibD\iconv"
+# PROP Target_Dir ""
 
 !ENDIF 
 
@@ -118,8 +74,12 @@
 
 # Name "apriconv_ccs_modules - Win32 Release"
 # Name "apriconv_ccs_modules - Win32 Debug"
-# Name "apriconv_ccs_modules - Win32 ReleaseNT"
-# Name "apriconv_ccs_modules - Win32 DebugNT"
+
+!IF  "$(CFG)" == "apriconv_ccs_modules - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "apriconv_ccs_modules - Win32 Debug"
+
+!ENDIF 
 
 # 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=582063&r1=582062&r2=582063&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ccs/libapriconv_ccs_modules.dsp (original)
+++ apr/apr-iconv/trunk/ccs/libapriconv_ccs_modules.dsp Thu Oct  4 20:13:31 2007
@@ -19,8 +19,6 @@
 !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
@@ -33,7 +31,7 @@
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\Release\iconv"
-# PROP BASE Intermediate_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 Rebuild_Opt "/a"
 # PROP BASE Target_File "libapriconv_ccs_modules.exe"
@@ -42,19 +40,19 @@
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\Release\iconv"
-# PROP Intermediate_Dir "Release"
+# PROP Intermediate_Dir "..\Release\iconv"
 # PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Buildmark.ccs"
+# PROP Target_File "Release"
 # PROP Bsc_Name ""
-# PROP Target_Dir "..\Release\iconv"
+# PROP Target_Dir ""
 
 !ELSEIF  "$(CFG)" == "libapriconv_ccs_modules - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\Debug\iconv"
-# PROP BASE Intermediate_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 Rebuild_Opt "/a"
 # PROP BASE Target_File "libapriconv_ccs_modules.exe"
@@ -63,54 +61,12 @@
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\Debug\iconv"
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir "..\Debug\iconv"
 # PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Buildmark.ccs"
+# PROP Target_File "Debug"
 # PROP Bsc_Name ""
-# 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\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\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 "Buildmark.ccs"
-# PROP Bsc_Name ""
-# 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\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\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 "Buildmark.ccs"
-# PROP Bsc_Name ""
-# PROP Target_Dir "..\Debug\iconv"
+# PROP Target_Dir ""
 
 !ENDIF 
 
@@ -118,8 +74,12 @@
 
 # Name "libapriconv_ccs_modules - Win32 Release"
 # Name "libapriconv_ccs_modules - Win32 Debug"
-# Name "libapriconv_ccs_modules - Win32 ReleaseNT"
-# Name "libapriconv_ccs_modules - Win32 DebugNT"
+
+!IF  "$(CFG)" == "libapriconv_ccs_modules - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libapriconv_ccs_modules - Win32 Debug"
+
+!ENDIF 
 
 # 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=582063&r1=582062&r2=582063&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/apriconv_ces_modules.dsp (original)
+++ apr/apr-iconv/trunk/ces/apriconv_ces_modules.dsp Thu Oct  4 20:13:31 2007
@@ -19,8 +19,6 @@
 !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
@@ -32,8 +30,8 @@
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\LibR\iconv"
-# PROP BASE Intermediate_Dir "LibR"
+# 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 Rebuild_Opt "/a"
 # PROP BASE Target_File "apriconv_ces_modules.exe"
@@ -41,20 +39,20 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\LibR\iconv"
-# PROP Intermediate_Dir "LibR"
+# 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 Rebuild_Opt "/a"
-# PROP Target_File "Buildmark.ces"
+# PROP Target_File "Release"
 # PROP Bsc_Name ""
-# PROP Target_Dir "..\LibR\iconv"
+# PROP Target_Dir ""
 
 !ELSEIF  "$(CFG)" == "apriconv_ces_modules - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\LibD\iconv"
-# PROP BASE Intermediate_Dir "LibD"
+# 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 Rebuild_Opt "/a"
 # PROP BASE Target_File "apriconv_ces_modules.exe"
@@ -62,55 +60,13 @@
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\LibD\iconv"
-# PROP Intermediate_Dir "LibD"
+# 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 Rebuild_Opt "/a"
-# PROP Target_File "Buildmark.ces"
+# PROP Target_File "Debug"
 # PROP Bsc_Name ""
-# 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\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\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 "Buildmark.ces"
-# PROP Bsc_Name ""
-# 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\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\iconv"
-# PROP Intermediate_Dir "..\LibD\iconv"
-# PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=static"
-# PROP Rebuild_Opt "/a"
-# PROP Target_File "Buildmark.ces"
-# PROP Bsc_Name ""
-# PROP Target_Dir "..\LibD\iconv"
+# PROP Target_Dir ""
 
 !ENDIF 
 
@@ -118,8 +74,12 @@
 
 # Name "apriconv_ces_modules - Win32 Release"
 # Name "apriconv_ces_modules - Win32 Debug"
-# Name "apriconv_ces_modules - Win32 ReleaseNT"
-# Name "apriconv_ces_modules - Win32 DebugNT"
+
+!IF  "$(CFG)" == "apriconv_ces_modules - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "apriconv_ces_modules - Win32 Debug"
+
+!ENDIF 
 
 # 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=582063&r1=582062&r2=582063&view=diff
==============================================================================
--- apr/apr-iconv/trunk/ces/libapriconv_ces_modules.dsp (original)
+++ apr/apr-iconv/trunk/ces/libapriconv_ces_modules.dsp Thu Oct  4 20:13:31 2007
@@ -19,8 +19,6 @@
 !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
@@ -30,87 +28,45 @@
 
 !IF  "$(CFG)" == "libapriconv_ces_modules - Win32 Release"
 
-# PROP BASE Use_MFC 0
+# PROP BASE Use_MFC
 # PROP BASE Use_Debug_Libraries 0
 # PROP BASE Output_Dir "..\Release\iconv"
-# PROP BASE Intermediate_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 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_MFC
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "..\Release\iconv"
-# PROP Intermediate_Dir "Release"
+# PROP Intermediate_Dir "..\Release\iconv"
 # PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=release BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Buildmark.ces"
+# PROP Target_File "Release"
 # PROP Bsc_Name ""
-# PROP Target_Dir "..\Release\iconv"
+# PROP Target_Dir ""
 
 !ELSEIF  "$(CFG)" == "libapriconv_ces_modules - Win32 Debug"
 
-# PROP BASE Use_MFC 0
+# PROP BASE Use_MFC
 # PROP BASE Use_Debug_Libraries 1
 # PROP BASE Output_Dir "..\Debug\iconv"
-# PROP BASE Intermediate_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 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_MFC
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "..\Debug\iconv"
-# PROP Intermediate_Dir "Debug"
+# PROP Intermediate_Dir "..\Debug\iconv"
 # PROP Cmd_Line "NMAKE /nologo /f Makefile.win BUILD_MODE=debug BIND_MODE=shared"
 # PROP Rebuild_Opt "/a"
-# PROP Target_File "Buildmark.ces"
+# PROP Target_File "Debug"
 # PROP Bsc_Name ""
-# 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\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\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 "Buildmark.ces"
-# PROP Bsc_Name ""
-# 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\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\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 "Buildmark.ces"
-# PROP Bsc_Name ""
-# PROP Target_Dir "..\Debug\iconv"
+# PROP Target_Dir ""
 
 !ENDIF 
 
@@ -118,8 +74,12 @@
 
 # Name "libapriconv_ces_modules - Win32 Release"
 # Name "libapriconv_ces_modules - Win32 Debug"
-# Name "libapriconv_ces_modules - Win32 ReleaseNT"
-# Name "libapriconv_ces_modules - Win32 DebugNT"
+
+!IF  "$(CFG)" == "libapriconv_ces_modules - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "libapriconv_ces_modules - Win32 Debug"
+
+!ENDIF 
 
 # Begin Group "Source Files"
 

Modified: apr/apr-iconv/trunk/libapriconv.dsp
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/libapriconv.dsp?rev=582063&r1=582062&r2=582063&view=diff
==============================================================================
--- apr/apr-iconv/trunk/libapriconv.dsp (original)
+++ apr/apr-iconv/trunk/libapriconv.dsp Thu Oct  4 20:13:31 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:"$(OutDir)\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" /opt:ref
 # Begin Special Build Tool
-TargetPath=$(OutDir)\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
@@ -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:"$(OutDir)\libapriconv-1.dll"
+# ADD LINK32 kernel32.lib advapi32.lib /nologo /base:"0x6EE50000" /subsystem:windows /dll
/incremental:no /debug /out:".\Debug\libapriconv-1.dll"
 # Begin Special Build Tool
-TargetPath=$(OutDir)\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



Mime
View raw message