Check-in [a1757bae4a]
Bounty program for improvements to Tcl and certain Tcl packages.
Overview
Comment:Make flags agree with the TEA build
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a1757bae4ab14d1fc979f5bb694f397f2a1d94c9
User & Date: patthoyts on 2005-01-14 16:07:11
Other Links: manifest | tags
Context
2005-02-09
00:58
* Makefile.in, tclconfig/tcl.m4: update to TEA 3.2 * configure, configure.in: check-in: eb8d3c2bf0 user: hobbs2 tags: trunk
2005-01-14
16:07
Make flags agree with the TEA build check-in: a1757bae4a user: patthoyts tags: trunk
2004-12-23
23:51
Fix the tests to deal safely with use of tls.tcl check-in: 209b05cd6f user: patthoyts tags: trunk
Changes

Modified win/makefile.vc from [ded96baf4e] to [125927e6af].

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
...
175
176
177
178
179
180
181


182
183
184
185
186
187
188
...
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
# Copyright (c) 1998-2000 Ajuba Solutions.
# Copyright (c) 2001 ActiveState Corporation.
# Copyright (c) 2001-2002 David Gravereaux.
# Copyright (c) 2003 Pat Thoyts
#
#-------------------------------------------------------------------------
# RCS: @(#)$Id: makefile.vc,v 1.1 2004/12/17 16:02:05 patthoyts Exp $
#-------------------------------------------------------------------------

!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCToolkitInstallDir)
MSG = ^
You will need to run vcvars32.bat from Developer Studio, first, to setup^
the environment.  Jump to this line to read the new instructions.
!error $(MSG)
................................................................................
OPENSSL = c:\opt
!endif

SSL_INCLUDE_DIR = $(OPENSSL)\include
SSL_LIB_DIR     = $(OPENSSL)\lib

SSL_LIBS        =-libpath:"$(SSL_LIB_DIR)" ssleay32s.lib libeay32s.lib



!if !exist("$(SSL_LIB_DIR)\ssleay32s.lib")
MSG = ^
You must provide the path to your OpenSSL library....
!error $(MSG)
!endif

................................................................................
!endif
!endif

INCLUDES	= $(TCL_INCLUDES) -I"$(WINDIR)" -I"$(GENERICDIR)" \
		  -I"$(SSL_INCLUDE_DIR)"
BASE_CLFAGS	= $(cflags) $(cdebug) $(crt) $(INCLUDES)
CON_CFLAGS	= $(cflags) $(cdebug) $(crt) -DCONSOLE
TCL_CFLAGS	= -DUSE_TCL_STUBS \
		  -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \
                  -DPACKAGE_NAME="\"$(PROJECT)\"" \
		  $(BASE_CLFAGS) $(OPTDEFINES)

#---------------------------------------------------------------------
# Link flags
#---------------------------------------------------------------------






|







 







>
>







 







|







14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
...
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
...
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
# Copyright (c) 1998-2000 Ajuba Solutions.
# Copyright (c) 2001 ActiveState Corporation.
# Copyright (c) 2001-2002 David Gravereaux.
# Copyright (c) 2003 Pat Thoyts
#
#-------------------------------------------------------------------------
# RCS: @(#)$Id: makefile.vc,v 1.2 2005/01/14 16:07:11 patthoyts Exp $
#-------------------------------------------------------------------------

!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCToolkitInstallDir)
MSG = ^
You will need to run vcvars32.bat from Developer Studio, first, to setup^
the environment.  Jump to this line to read the new instructions.
!error $(MSG)
................................................................................
OPENSSL = c:\opt
!endif

SSL_INCLUDE_DIR = $(OPENSSL)\include
SSL_LIB_DIR     = $(OPENSSL)\lib

SSL_LIBS        =-libpath:"$(SSL_LIB_DIR)" ssleay32s.lib libeay32s.lib

SSL_CFLAGS      =-DNO_IDEA=1 -DNO_RC5=1

!if !exist("$(SSL_LIB_DIR)\ssleay32s.lib")
MSG = ^
You must provide the path to your OpenSSL library....
!error $(MSG)
!endif

................................................................................
!endif
!endif

INCLUDES	= $(TCL_INCLUDES) -I"$(WINDIR)" -I"$(GENERICDIR)" \
		  -I"$(SSL_INCLUDE_DIR)"
BASE_CLFAGS	= $(cflags) $(cdebug) $(crt) $(INCLUDES)
CON_CFLAGS	= $(cflags) $(cdebug) $(crt) -DCONSOLE
TCL_CFLAGS	= -DUSE_TCL_STUBS -DBUILD_$(PROJECT) $(SSL_CFLAGS) \
		  -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \
                  -DPACKAGE_NAME="\"$(PROJECT)\"" \
		  $(BASE_CLFAGS) $(OPTDEFINES)

#---------------------------------------------------------------------
# Link flags
#---------------------------------------------------------------------