Revision: 3753
http://svn.sourceforge.net/winmerge/?rev=3753&view=rev
Author: kimmov
Date: 2006-11-01 08:28:40 -0800 (Wed, 01 Nov 2006)
Log Message:
-----------
Changes for WinMerge compile:
2006-11-01 Kimmo Varis <ki...@wi...>
* scew/win32/scew.dsp: added library paths to WinMerge /Build/expat
Modified Paths:
--------------
trunk/Externals/scew/ChangeLog
trunk/Externals/scew/win32/scew.dsp
Modified: trunk/Externals/scew/ChangeLog
===================================================================
--- trunk/Externals/scew/ChangeLog 2006-11-01 15:48:02 UTC (rev 3752)
+++ trunk/Externals/scew/ChangeLog 2006-11-01 16:28:40 UTC (rev 3753)
@@ -1,3 +1,8 @@
+Changes for WinMerge compile:
+2006-11-01 Kimmo Varis <ki...@wi...>
+
+ * scew/win32/scew.dsp: added library paths to WinMerge /Build/expat
+
**** Changes in version 0.3.2 ****
2004-05-23 Aleix Conchillo Flaque <al...@me...>
Modified: trunk/Externals/scew/win32/scew.dsp
===================================================================
--- trunk/Externals/scew/win32/scew.dsp 2006-11-01 15:48:02 UTC (rev 3752)
+++ trunk/Externals/scew/win32/scew.dsp 2006-11-01 16:28:40 UTC (rev 3753)
@@ -1,30 +1,30 @@
# Microsoft Developer Studio Project File - Name="scew" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** \x95ҏW\x82\xB5\x82Ȃ\xA2\x82ł\xAD\x82\xBE\x82\xB3\x82\xA2 **
+# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=scew - Win32 XMLStatic Debug Unicode
-!MESSAGE \x82\xB1\x82\xEA\x82͗L\x8C\xF8\x82\xC8Ҳ\xB8̧\xB2قł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81B \x82\xB1\x82\xCC\xCC\xDFۼު\xB8Ă\xF0\xCB\xDE\xD9\xC4ނ\xB7\x82邽\x82߂ɂ\xCD NMAKE \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-!MESSAGE [Ҳ\xB8̧\xB2ق̴\xB8\xBD\xCE߰\xC4] \xBA\xCF\xDD\xC4ނ\xF0\x8Eg\x97p\x82\xB5\x82Ď\xC0\x8Ds\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "scew.mak".
!MESSAGE
-!MESSAGE NMAKE \x82̎\xC0\x8Ds\x8E\x9E\x82ɍ\\x90\xAC\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82܂\xB7
-!MESSAGE \xBA\xCF\xDD\xC4\xDE ײݏ\xE3\x82\xC5ϸۂ̐ݒ\xE8\x82\xF0\x92\xE8\x8B`\x82\xB5\x82܂\xB7\x81B\x97\xE1:
+!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 "scew.mak" CFG="scew - Win32 XMLStatic Debug Unicode"
!MESSAGE
-!MESSAGE \x91I\x91\xF0\x89\\x82\xC8\xCB\xDE\xD9\xC4\xDE Ӱ\xC4\xDE:
+!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "scew - Win32 Release" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 Debug" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 Debug Unicode" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 Release Unicode" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 XMLStatic Debug" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 XMLStatic Release" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 XMLStatic Debug Unicode" ("Win32 (x86) Static Library" \x97p)
-!MESSAGE "scew - Win32 XMLStatic Release Unicode" ("Win32 (x86) Static Library" \x97p)
+!MESSAGE "scew - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 XMLStatic Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 XMLStatic Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 XMLStatic Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "scew - Win32 XMLStatic Release Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -47,7 +47,7 @@
# PROP Intermediate_Dir "obj\Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../../expat/lib" /I "../../expat/xmlwf" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x411 /d "NDEBUG"
# ADD RSC /l 0x411 /d "NDEBUG"
@@ -71,7 +71,7 @@
# PROP Intermediate_Dir "obj\Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "../../expat/lib" /I "../../expat/xmlwf" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x411 /d "_DEBUG"
# ADD RSC /l 0x411 /d "_DEBUG"
@@ -96,7 +96,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "../../expat/lib" /I "../../expat/xmlwf" /D "_DEBUG" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /GZ /c
# SUBTRACT CPP /WX /YX
# ADD BASE RSC /l 0x411 /d "_DEBUG"
# ADD RSC /l 0x411 /d "_DEBUG"
@@ -146,7 +146,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_LIB" /D "XML_STATIC" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "../../expat/lib" /I "../../expat/xmlwf" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_LIB" /D "XML_STATIC" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x411 /d "_DEBUG"
# ADD RSC /l 0x411 /d "_DEBUG"
@@ -171,7 +171,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W4 /GX /O2 /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_LIB" /D "XML_STATIC" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../../expat/lib" /I "../../expat/xmlwf" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_LIB" /D "XML_STATIC" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x411 /d "NDEBUG"
# ADD RSC /l 0x411 /d "NDEBUG"
@@ -196,7 +196,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "_UNICODE" /D "WIN32" /D "_LIB" /FD /GZ /c
# SUBTRACT BASE CPP /WX /YX
-# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "XML_STATIC" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /Gm /GX /ZI /Od /I "../../expat/lib" /I "../../expat/xmlwf" /D "_DEBUG" /D "XML_STATIC" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /GZ /c
# SUBTRACT CPP /WX /YX
# ADD BASE RSC /l 0x411 /d "_DEBUG"
# ADD RSC /l 0x411 /d "_DEBUG"
@@ -221,7 +221,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "NDEBUG" /D "_UNICODE" /D "WIN32" /D "_LIB" /FD /c
# SUBTRACT BASE CPP /WX /YX
-# ADD CPP /nologo /MD /W4 /GX /O2 /D "NDEBUG" /D "XML_STATIC" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../../expat/lib" /I "../../expat/xmlwf" /D "NDEBUG" /D "XML_STATIC" /D "WIN32" /D "_LIB" /D "_UNICODE" /D "XML_UNICODE_WCHAR_T" /FD /c
# SUBTRACT CPP /WX /YX
# ADD BASE RSC /l 0x411 /d "NDEBUG"
# ADD RSC /l 0x411 /d "NDEBUG"
@@ -366,4 +366,3 @@
# End Group
# End Target
# End Project
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|