Attachment "vc.patch" to
ticket [3056785fff]
added by
dgp
2010-11-17 04:31:31.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/tcl/thread/Makefile.in,v
retrieving revision 1.26
diff -u -r1.26 Makefile.in
--- Makefile.in 7 Aug 2007 06:59:05 -0000 1.26
+++ Makefile.in 16 Nov 2010 21:22:25 -0000
@@ -301,11 +301,11 @@
cp $(srcdir)/win/README.txt $(srcdir)/win/CONFIG $(srcdir)/win/thread.rc \
$(srcdir)/win/threadWin.c $(DIST_DIR)/win/
- mkdir $(DIST_DIR)/win/vc
- cp $(srcdir)/win/vc/README.txt $(srcdir)/win/vc/makefile.vc \
+ cp $(srcdir)/win/vc/makefile.vc \
$(srcdir)/win/vc/nmakehlp.c $(srcdir)/win/vc/pkg.vc \
$(srcdir)/win/vc/rules.vc $(srcdir)/win/vc/thread_win.dsw \
- $(srcdir)/win/vc/thread_win.dsp $(DIST_DIR)/win/vc/
+ $(srcdir)/win/vc/thread_win.dsp $(DIST_DIR)/win/
+ cp $(srcdir)/win/vc/README.txt $(DIST_DIR)/win/README.vc.txt
mkdir $(DIST_DIR)/tcl
cp $(srcdir)/tcl/README $(DIST_DIR)/tcl/
Index: win/README.txt
===================================================================
RCS file: /cvsroot/tcl/thread/win/README.txt,v
retrieving revision 1.14
diff -u -r1.14 README.txt
--- win/README.txt 1 Dec 2003 19:57:20 -0000 1.14
+++ win/README.txt 16 Nov 2010 21:22:25 -0000
@@ -28,8 +28,8 @@
--------------------------
You should use the makefile.vc file for the MSVC++ located
-in the vc/ directory. Please consult the vc/README.txt and
-vc/makefile.vc files for more details.
+in the vc/ directory. Please consult the README.vc.txt and
+makefile.vc files for more details.
Alternatively, you can use the MSVC++ IDE and open the
thread_win.dsw workspace file.
Index: win/vc/makefile.vc
===================================================================
RCS file: /cvsroot/tcl/thread/win/vc/makefile.vc,v
retrieving revision 1.33
diff -u -r1.33 makefile.vc
--- win/vc/makefile.vc 4 May 2009 22:46:17 -0000 1.33
+++ win/vc/makefile.vc 16 Nov 2010 21:22:25 -0000
@@ -191,7 +191,7 @@
#-------------------------------------------------------------------------
BINROOT = .
-ROOT = ..\..
+ROOT = ..
PRJIMPLIB = $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
PRJLIBNAME = $(PROJECT)$(VERSION)$(SUFX).$(EXT)
Index: win/vc/thread_win.dsp
===================================================================
RCS file: /cvsroot/tcl/thread/win/vc/thread_win.dsp,v
retrieving revision 1.2
diff -u -r1.2 thread_win.dsp
--- win/vc/thread_win.dsp 23 Dec 2004 09:12:51 -0000 1.2
+++ win/vc/thread_win.dsp 16 Nov 2010 21:22:25 -0000
@@ -81,68 +81,70 @@
!ENDIF
+ROOT=..
+
# Begin Group "generic"
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\generic\aolstub.cpp
+SOURCE=$(ROOT)\generic\aolstub.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\generic\psGdbm.c
+SOURCE=$(ROOT)\generic\psGdbm.c
# End Source File
# Begin Source File
-SOURCE=..\..\generic\psGdbm.h
+SOURCE=$(ROOT)\generic\psGdbm.h
# End Source File
# Begin Source File
-SOURCE=..\..\generic\tclThread.h
+SOURCE=$(ROOT)\generic\tclThread.h
# End Source File
# Begin Source File
-SOURCE=..\..\generic\tclXkeylist.c
+SOURCE=$(ROOT)\generic\tclXkeylist.c
# End Source File
# Begin Source File
-SOURCE=..\..\generic\tclXkeylist.h
+SOURCE=$(ROOT)\generic\tclXkeylist.h
# End Source File
# Begin Source File
-SOURCE=..\..\generic\threadCmd.c
+SOURCE=$(ROOT)\generic\threadCmd.c
# End Source File
# Begin Source File
-SOURCE=..\..\generic\threadPoolCmd.c
+SOURCE=$(ROOT)\generic\threadPoolCmd.c
# End Source File
# Begin Source File
-SOURCE=..\..\generic\threadSpCmd.c
+SOURCE=$(ROOT)\generic\threadSpCmd.c
# End Source File
# Begin Source File
-SOURCE=..\..\generic\threadSvCmd.c
+SOURCE=$(ROOT)\generic\threadSvCmd.c
# End Source File
# Begin Source File
-SOURCE=..\..\generic\threadSvCmd.h
+SOURCE=$(ROOT)\generic\threadSvCmd.h
# End Source File
# Begin Source File
-SOURCE=..\..\generic\threadSvKeylistCmd.c
+SOURCE=$(ROOT)\generic\threadSvKeylistCmd.c
# End Source File
# Begin Source File
-SOURCE=..\..\generic\threadSvKeylistCmd.h
+SOURCE=$(ROOT)\generic\threadSvKeylistCmd.h
# End Source File
# Begin Source File
-SOURCE=..\..\generic\threadSvListCmd.c
+SOURCE=$(ROOT)\generic\threadSvListCmd.c
# End Source File
# Begin Source File
-SOURCE=..\..\generic\threadSvListCmd.h
+SOURCE=$(ROOT)\generic\threadSvListCmd.h
# End Source File
# End Group
# Begin Group "doc"
@@ -153,19 +155,19 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\doc\html\thread.html
+SOURCE=$(ROOT)\doc\html\thread.html
# End Source File
# Begin Source File
-SOURCE=..\..\doc\html\tpool.html
+SOURCE=$(ROOT)\doc\html\tpool.html
# End Source File
# Begin Source File
-SOURCE=..\..\doc\html\tsv.html
+SOURCE=$(ROOT)\doc\html\tsv.html
# End Source File
# Begin Source File
-SOURCE=..\..\doc\html\ttrace.html
+SOURCE=$(ROOT)\doc\html\ttrace.html
# End Source File
# End Group
# Begin Group "man"
@@ -173,44 +175,44 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\doc\man\thread.n
+SOURCE=$(ROOT)\doc\man\thread.n
# End Source File
# Begin Source File
-SOURCE=..\..\doc\man\tpool.n
+SOURCE=$(ROOT)\doc\man\tpool.n
# End Source File
# Begin Source File
-SOURCE=..\..\doc\man\tsv.n
+SOURCE=$(ROOT)\doc\man\tsv.n
# End Source File
# Begin Source File
-SOURCE=..\..\doc\man\ttrace.n
+SOURCE=$(ROOT)\doc\man\ttrace.n
# End Source File
# End Group
# Begin Source File
-SOURCE=..\..\doc\format.tcl
+SOURCE=$(ROOT)\doc\format.tcl
# End Source File
# Begin Source File
-SOURCE=..\..\doc\man.macros
+SOURCE=$(ROOT)\doc\man.macros
# End Source File
# Begin Source File
-SOURCE=..\..\doc\thread.man
+SOURCE=$(ROOT)\doc\thread.man
# End Source File
# Begin Source File
-SOURCE=..\..\doc\tpool.man
+SOURCE=$(ROOT)\doc\tpool.man
# End Source File
# Begin Source File
-SOURCE=..\..\doc\tsv.man
+SOURCE=$(ROOT)\doc\tsv.man
# End Source File
# Begin Source File
-SOURCE=..\..\doc\ttrace.man
+SOURCE=$(ROOT)\doc\ttrace.man
# End Source File
# End Group
# Begin Group "win"
@@ -233,7 +235,7 @@
# End Source File
# Begin Source File
-SOURCE=.\README.txt
+SOURCE=.\README.vc.txt
# End Source File
# Begin Source File
@@ -242,28 +244,28 @@
# End Group
# Begin Source File
-SOURCE=..\README.txt
+SOURCE=$(ROOT)\win\README.txt
# End Source File
# Begin Source File
-SOURCE=..\thread.rc
+SOURCE=$(ROOT)\win\thread.rc
# End Source File
# Begin Source File
-SOURCE=..\threadWin.c
+SOURCE=$(ROOT)\win\threadWin.c
# End Source File
# End Group
# Begin Source File
-SOURCE=..\..\ChangeLog
+SOURCE=$(ROOT)\ChangeLog
# End Source File
# Begin Source File
-SOURCE=..\..\license.terms
+SOURCE=$(ROOT)\license.terms
# End Source File
# Begin Source File
-SOURCE=..\..\README
+SOURCE=$(ROOT)\README
# End Source File
# End Target
# End Project