OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b154cc7)
Update Merge7z project files to build to ../Build directories in same fashion as...
authorPerry Rapp <elsapo@users.sourceforge.net>
Sun, 11 Jan 2004 00:05:24 +0000 (00:05 +0000)
committerPerry Rapp <elsapo@users.sourceforge.net>
Sun, 11 Jan 2004 00:05:24 +0000 (00:05 +0000)
ArchiveSupport/Merge7z/Merge7z311.dsp patch | blob | history
ArchiveSupport/Merge7z/Merge7z312.dsp patch | blob | history
ArchiveSupport/Merge7z/Merge7z313.dsp patch | blob | history
Src/readme.txt patch | blob | history

diff --git a/ArchiveSupport/Merge7z/Merge7z311.dsp b/ArchiveSupport/Merge7z/Merge7z311.dsp
index 41cc81f..6a81e92 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z311.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z311.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Merge7z311___Win32_Release"
-# PROP Intermediate_Dir "Merge7z311___Win32_Release"
+# PROP Output_Dir "..\Build\MergeRelease"
+# PROP Intermediate_Dir "..\Build\MergeRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z311.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386
 
 !ELSEIF  "$(CFG)" == "Merge7z311 - Win32 Debug"
 
@@ -66,8 +66,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Merge7z311___Win32_Debug"
-# PROP Intermediate_Dir "Merge7z311___Win32_Debug"
+# PROP Output_Dir "..\Build\MergeDebug"
+# PROP Intermediate_Dir "..\Build\MergeDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z311.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386
 # SUBTRACT LINK32 /map
 
 !ELSEIF  "$(CFG)" == "Merge7z311 - Win32 UnicodeDebug"
@@ -94,8 +94,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Merge7z311___Win32_UnicodeDebug"
-# PROP Intermediate_Dir "Merge7z311___Win32_UnicodeDebug"
+# PROP Output_Dir "..\Build\MergeUnicodeDebug"
+# PROP Intermediate_Dir "..\Build\MergeUnicodeDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z311" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
@@ -122,8 +122,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Merge7z311___Win32_UnicodeRelease"
-# PROP Intermediate_Dir "Merge7z311___Win32_UnicodeRelease"
+# PROP Output_Dir "..\Build\MergeUnicodeRelease"
+# PROP Intermediate_Dir "..\Build\MergeUnicodeRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../7z311" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
diff --git a/ArchiveSupport/Merge7z/Merge7z312.dsp b/ArchiveSupport/Merge7z/Merge7z312.dsp
index 49b72bc..bd39d23 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z312.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z312.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Merge7z312___Win32_Release"
-# PROP Intermediate_Dir "Merge7z312___Win32_Release"
+# PROP Output_Dir "..\Build\MergeRelease"
+# PROP Intermediate_Dir "..\Build\MergeRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z312.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386
 
 !ELSEIF  "$(CFG)" == "Merge7z312 - Win32 Debug"
 
@@ -66,8 +66,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Merge7z312___Win32_Debug"
-# PROP Intermediate_Dir "Merge7z312___Win32_Debug"
+# PROP Output_Dir "..\Build\MergeDebug"
+# PROP Intermediate_Dir "..\Build\MergeDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z312.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386
 # SUBTRACT LINK32 /map
 
 !ELSEIF  "$(CFG)" == "Merge7z312 - Win32 UnicodeDebug"
@@ -94,8 +94,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Merge7z312___Win32_UnicodeDebug"
-# PROP Intermediate_Dir "Merge7z312___Win32_UnicodeDebug"
+# PROP Output_Dir "..\Build\MergeUnicodeDebug"
+# PROP Intermediate_Dir "..\Build\MergeUnicodeDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z312" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
@@ -122,8 +122,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Merge7z312___Win32_UnicodeRelease"
-# PROP Intermediate_Dir "Merge7z312___Win32_UnicodeRelease"
+# PROP Output_Dir "..\Build\MergeUnicodeRelease"
+# PROP Intermediate_Dir "..\Build\MergeUnicodeRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../7z312" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
diff --git a/ArchiveSupport/Merge7z/Merge7z313.dsp b/ArchiveSupport/Merge7z/Merge7z313.dsp
index 9f6aa1d..43f75f6 100755 (executable)
--- a/ArchiveSupport/Merge7z/Merge7z313.dsp
+++ b/ArchiveSupport/Merge7z/Merge7z313.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Merge7z313___Win32_Release"
-# PROP Intermediate_Dir "Merge7z313___Win32_Release"
+# PROP Output_Dir "..\Build\MergeRelease"
+# PROP Intermediate_Dir "..\Build\MergeRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /c
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386 /out:"../Build/MergeRelease/Merge7z313.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /machine:I386
 
 !ELSEIF  "$(CFG)" == "Merge7z313 - Win32 Debug"
 
@@ -66,8 +66,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Merge7z313___Win32_Debug"
-# PROP Intermediate_Dir "Merge7z313___Win32_Debug"
+# PROP Output_Dir "..\Build\MergeDebug"
+# PROP Intermediate_Dir "..\Build\MergeDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /YX /FD /GZ /c
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386 /out:"../Build/MergeDebug/Merge7z313.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shlwapi.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /pdb:none /debug /machine:I386
 # SUBTRACT LINK32 /map
 
 !ELSEIF  "$(CFG)" == "Merge7z313 - Win32 UnicodeDebug"
@@ -94,8 +94,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Merge7z313___Win32_UnicodeDebug"
-# PROP Intermediate_Dir "Merge7z313___Win32_UnicodeDebug"
+# PROP Output_Dir "..\Build\MergeUnicodeDebug"
+# PROP Intermediate_Dir "..\Build\MergeUnicodeDebug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /vd0 /GX /Z7 /Od /I "../../7z313" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /FR /Yu"stdafx.h" /FD /GZ /c
@@ -122,8 +122,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Merge7z313___Win32_UnicodeRelease"
-# PROP Intermediate_Dir "Merge7z313___Win32_UnicodeRelease"
+# PROP Output_Dir "..\Build\MergeUnicodeRelease"
+# PROP Intermediate_Dir "..\Build\MergeUnicodeRelease"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../7z313" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "MERGE7Z310_EXPORTS" /Yu"stdafx.h" /FD /c
diff --git a/Src/readme.txt b/Src/readme.txt
index efc6aa9..6ba175d 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2004-01-11 Perry
+ Update Merge7z project files to build to ../Build directories
+ in same fashion as WinMerge project
+  Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
+
 2004-01-09 Perry
  PATCH: [ 872762 ] Stricter error handling for Plugins
   WinMerge: Plugins.cpp
About OSDN
Find Software
Develop Software
Help