Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Accept more Win native build improvements from Ralf Fassel. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | itk-3-4-1 | itk-3-branch |
| Files: | files | file ages | folders |
| SHA1: |
6d12daee3056e259ce5c479b37b5f0d5 |
| User & Date: | dgp 2015-03-19 16:44:32 |
Context
|
2015-12-10
| ||
| 18:50 | Make version demand in testing to avoid worst testing errors. check-in: 802488c6f5 user: dgp tags: itk-3-branch | |
|
2015-03-19
| ||
| 16:44 | Accept more Win native build improvements from Ralf Fassel. check-in: 6d12daee30 user: dgp tags: itk-3-4-1, itk-3-branch | |
|
2015-03-18
| ||
| 13:16 | Recover the rules.vc from CVS toplevel check-in: 99bfa871db user: dgp tags: itk-3-branch | |
Changes
Changes to win/makefile.vc.
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
...
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
ITKLIBNAME = $(PROJECT)$(ITK_VERSION)$(SUFX).$(EXT) ITCLIMPLIBNAME = itcl$(ITCL_VERSION)$(SUFX).$(EXT) !else ITKLIBNAME = $(PROJECT)$(ITK_VERSION)80$(SUFX).$(EXT) ITCLIMPLIBNAME = itcl$(ITCL_VERSION)80$(SUFX).lib !endif ITKLIB = "$(OUT_DIR)\$(ITKLIBNAME)" ITCLIMPLIB = "$(ITCLDIR)\win\Release\$(ITCLIMPLIBNAME)" !if $(TCLINSTALL) TKSTUBLIB = "$(TCLDIR)\lib\tkstub$(TCL_VERSION).lib" TKIMPLIB = "$(TCLDIR)\lib\tk$(TCL_VERSION)$(DBGX).lib" TKLIB = "$(TCLDIR)\bin\tk$(TCL_VERSION)$(DBGX).dll" WISH = "$(TCLDIR)\bin\wish$(TCL_VERSION)$(DBGX).exe" TCL_LIBRARY = TK_LIBRARY = !else TKSTUBLIB = "$(TKDIR)\win\Release\tkstub$(TCL_VERSION).lib" TKIMPLIB = "$(TKDIR)\win\$(OUT_DIR)\tk$(TCL_VERSION)$(DBGX).lib" TKLIB = "$(TKDIR)\win\$(OUT_DIR)\tk$(TCL_VERSION)$(DBGX).dll" WISH = "$(TKDIR)\win\$(OUT_DIR)\wish$(TCL_VERSION)$(DBGX).exe" TCL_LIBRARY = "$(TCLDIR)\library" TK_LIBRARY = "$(TKDIR)\library" !endif ITCL_LIBRARY = "$(ITCLDIR:\=/)/library" ITK_LIBRARY = "$(ROOT)/library" ITCLSTUBLIBNAME = itclstub$(ITCL_VERSION).lib ITCLSTUBLIB = "$(ITCLDIR)\win\Release\$(ITCLSTUBLIBNAME)" ### For Tcl 8.0 !if !$(TCL_DOES_STUBS) TCLSTUBLIB = $(TCLIMPLIB) TKSTUBLIB = $(TKIMPLIB) ITCLSTUBLIB = $(ITCLIMPLIB) !endif ................................................................................ !endif !else # This cranks the optimization level up to max. cdebug = -O2 !endif # declarations common to all compiler options cflags = -nologo -c -W3 -YX -Fp$(TMP_DIR)^\ !if $(PENT_0F_ERRATA) cflags = $(cflags) -QI0f !endif !if $(ITAN_B_ERRATA) cflags = $(cflags) -QIA64_Bx |
|
|
|
|
|
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
...
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
ITKLIBNAME = $(PROJECT)$(ITK_VERSION)$(SUFX).$(EXT) ITCLIMPLIBNAME = itcl$(ITCL_VERSION)$(SUFX).$(EXT) !else ITKLIBNAME = $(PROJECT)$(ITK_VERSION)80$(SUFX).$(EXT) ITCLIMPLIBNAME = itcl$(ITCL_VERSION)80$(SUFX).lib !endif ITKLIB = "$(OUT_DIR)\$(ITKLIBNAME)" ITCLIMPLIB = "$(ITCLDIR)\win\$(BUILDDIRTOP)\$(ITCLIMPLIBNAME)" !if $(TCLINSTALL) TKSTUBLIB = "$(TCLDIR)\lib\tkstub$(TCL_VERSION).lib" TKIMPLIB = "$(TCLDIR)\lib\tk$(TCL_VERSION)$(DBGX).lib" TKLIB = "$(TCLDIR)\bin\tk$(TCL_VERSION)$(DBGX).dll" WISH = "$(TCLDIR)\bin\wish$(TCL_VERSION)$(DBGX).exe" TCL_LIBRARY = TK_LIBRARY = !else TKSTUBLIB = "$(TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_VERSION).lib" TKIMPLIB = "$(TKDIR)\win\$(OUT_DIR)\tk$(TCL_VERSION)$(DBGX).lib" TKLIB = "$(TKDIR)\win\$(OUT_DIR)\tk$(TCL_VERSION)$(DBGX).dll" WISH = "$(TKDIR)\win\$(OUT_DIR)\wish$(TCL_VERSION)$(DBGX).exe" TCL_LIBRARY = "$(TCLDIR)\library" TK_LIBRARY = "$(TKDIR)\library" !endif ITCL_LIBRARY = "$(ITCLDIR:\=/)/library" ITK_LIBRARY = "$(ROOT)/library" ITCLSTUBLIBNAME = itclstub$(ITCL_VERSION).lib ITCLSTUBLIB = "$(ITCLDIR)\win\$(BUILDDIRTOP)\$(ITCLSTUBLIBNAME)" ### For Tcl 8.0 !if !$(TCL_DOES_STUBS) TCLSTUBLIB = $(TCLIMPLIB) TKSTUBLIB = $(TKIMPLIB) ITCLSTUBLIB = $(ITCLIMPLIB) !endif ................................................................................ !endif !else # This cranks the optimization level up to max. cdebug = -O2 !endif # declarations common to all compiler options cflags = -nologo -c -W3 -YX -D_USE_32BIT_TIME_T -Fp$(TMP_DIR)^\ !if $(PENT_0F_ERRATA) cflags = $(cflags) -QI0f !endif !if $(ITAN_B_ERRATA) cflags = $(cflags) -QIA64_Bx |
Changes to win/rules.vc.
24
25
26
27
28
29
30
31
32
33
34
35
36
37
...
215
216
217
218
219
220
221
222
223
224
225
226
227
228
|
!ifndef INSTALLDIR
### Assume the normal default.
_INSTALLDIR = C:\Program Files\Tcl
!else
### Fix the path seperators.
_INSTALLDIR = $(INSTALLDIR:/=\)
!endif
!ifndef MACHINE
MACHINE = IX86
!endif
!ifndef CFG_ENCODING
CFG_ENCODING = \"cp1252\"
................................................................................
SUFX = tsgx
!if $(DEBUG)
BUILDDIRTOP = Debug
!else
BUILDDIRTOP = Release
!endif
!if !$(DEBUG) || $(DEBUG) && $(UNCHECKED)
SUFX = $(SUFX:g=)
!endif
TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
...
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
|
!ifndef INSTALLDIR ### Assume the normal default. _INSTALLDIR = C:\Program Files\Tcl !else ### Fix the path seperators. _INSTALLDIR = $(INSTALLDIR:/=\) !endif #------------------------------------------------------------------------------ # Determine the host and target architectures and compiler version. #------------------------------------------------------------------------------ _HASH=^# _VC_MANIFEST_EMBED_EXE= _VC_MANIFEST_EMBED_DLL= VCVER=0 !if ![echo VCVERSION=_MSC_VER > vercl.x] \ && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \ && ![echo ARCH=IX86 >> vercl.x] \ && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \ && ![echo ARCH=AMD64 >> vercl.x] \ && ![echo $(_HASH)endif >> vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNULL)] !include vercl.i !if ![echo VCVER= ^\> vercl.vc] \ && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] !include vercl.vc !endif !endif !if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] !endif !if ![reg query HKLM\Hardware\Description\System\CentralProcessor\0 /v Identifier | findstr /i x86] NATIVE_ARCH=IX86 !else NATIVE_ARCH=AMD64 !endif # Since MSVC8 we must deal with manifest resources. !if $(VCVERSION) >= 1400 _VC_MANIFEST_EMBED_EXE=if exist [email protected] mt -nologo -manifest [email protected] -outputresource:[email protected];1 _VC_MANIFEST_EMBED_DLL=if exist [email protected] mt -nologo -manifest [email protected] -outputresource:[email protected];2 !endif !ifndef MACHINE MACHINE = IX86 !endif !ifndef CFG_ENCODING CFG_ENCODING = \"cp1252\" ................................................................................ SUFX = tsgx !if $(DEBUG) BUILDDIRTOP = Debug !else BUILDDIRTOP = Release !endif !if "$(MACHINE)" != "IX86" BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE) !endif !if $(VCVER) > 6 BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER) !endif !if !$(DEBUG) || $(DEBUG) && $(UNCHECKED) SUFX = $(SUFX:g=) !endif TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX |