summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchengyemao <chengyemao>2007-02-28 05:26:37 (GMT)
committerchengyemao <chengyemao>2007-02-28 05:26:37 (GMT)
commit972e984924b244025bb66cb5b7935f1dd0625eef (patch)
tree9c675fd1c5c626cdbda6702989ab1673b628ba32
parent92ae3868354a366b587cc61f7517bcd4e914f862 (diff)
downloadtk-972e984924b244025bb66cb5b7935f1dd0625eef.zip
tk-972e984924b244025bb66cb5b7935f1dd0625eef.tar.gz
tk-972e984924b244025bb66cb5b7935f1dd0625eef.tar.bz2
Added compliler define SUPPORT_CONFIG_EMBEDDED to support config of -use option at Windows
-rw-r--r--win/makefile.bc4
-rw-r--r--win/makefile.vc3
2 files changed, 4 insertions, 3 deletions
diff --git a/win/makefile.bc b/win/makefile.bc
index 18d950c..6e4255c 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -13,7 +13,7 @@
# Copyright (c) 1995-1997 Sun Microsystems, Inc.
# Copyright (c) 1998-2000 Ajuba Solutions.
#
-# RCS: @(#) $Id: makefile.bc,v 1.12 2004/04/24 07:38:17 das Exp $
+# RCS: @(#) $Id: makefile.bc,v 1.13 2007/02/28 05:26:37 chengyemao Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -243,7 +243,7 @@ RCDIR = $(WINDIR)\rc
TK_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \
-I$(TCLDIR)\generic -I$(TCLDIR)\win
-TK_DEFINES = -D__WIN32__ $(DEBUGDEFINES) $(THREADDEFINES)
+TK_DEFINES = -D__WIN32__ $(DEBUGDEFINES) $(THREADDEFINES) SUPPORT_CONFIG_EMBEDDED
######################################################################
# Compile flags
diff --git a/win/makefile.vc b/win/makefile.vc
index 98c469e..e640c7f 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2004 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.100 2007/02/09 06:54:33 mistachkin Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.101 2007/02/28 05:26:37 chengyemao Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -412,6 +412,7 @@ TK_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(BITMAPDIR)" -I"$(XLIBDIR)" \
CONFIG_DEFS =-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
-DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
+ -DSUPPORT_CONFIG_EMBEDDED \
!if $(HAVE_UXTHEME_H)
-DHAVE_UXTHEME_H=1 \
!endif