Skip to content

Commit

Permalink
update to latest TEA
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Oct 8, 2013
1 parent d0b17ad commit 79035e3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 15 deletions.
3 changes: 3 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -11548,6 +11548,9 @@ rm -f conftest*
eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
else
eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
if test "$GCC" = "yes"; then
PKG_LIB_FILE=lib${PKG_LIB_FILE}
fi
fi
# Some packages build their own stubs libraries
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
Expand Down
33 changes: 18 additions & 15 deletions win/makefile.vc
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ the build instructions.
# nodep = Turns off compatability macros to ensure Tk isn't
# being built with deprecated functions.
#
# MACHINE=(ALPHA|AMD64|IA64|IX86)
# MACHINE=(ARM|AMD64|IA64|X86)
# Set the machine type used for the compiler, linker, and
# resource compiler. This hook is needed to tell the tools
# when alternate platforms are requested. IX86 is the default
Expand Down Expand Up @@ -256,9 +256,16 @@ cdebug = -Zi -Od $(DEBUGFLAGS)
cdebug = -Zi -WX $(DEBUGFLAGS)
!endif

### Common compiler options that are architecture specific
!if "$(MACHINE)" == "ARM"
carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
!else
carch =
!endif

### Declarations common to all compiler options
cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\
cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\

!if $(MSVCRT)
!if $(DEBUG) && !$(UNCHECKED)
Expand All @@ -274,14 +281,10 @@ crt = -MT
!endif
!endif

cflags = $(cflags) -DMODULE_SCOPE=extern

!if !$(STATIC_BUILD)
cflags = $(cflags) -DUSE_TCL_STUBS
cflags = $(cflags) -DMODULE_SCOPE=extern -DUSE_TCL_STUBS
!if defined(TKSTUBLIB)
cflags = $(cflags) -DUSE_TK_STUBS
!endif
!endif

INCLUDES = $(TCL_INCLUDES) -I"$(WINDIR)" -I"$(GENERICDIR)"
BASE_CFLAGS = $(cflags) $(cdebug) $(crt) $(INCLUDES)
Expand Down Expand Up @@ -366,26 +369,26 @@ $(PROJECT): $(PRJSTUBLIB)
!endif

test: setup $(PROJECT)
@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
@set TCLLIBPATH=$(OUT_DIR_PATH:\=/)
@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
@set TCLLIBPATH=$(OUT_DIR_PATH:\=/)
@set TDBC_LIBRARY=$(LIBDIR:\=/)
@$(CPY) $(LIBDIR)\*.tcl $(OUT_DIR)
!if $(TCLINSTALL)
@set PATH=$(_TCLDIR)\bin;$(PATH)
@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
$(DEBUGGER) $(TCLSH) "$(ROOT)/tests/all.tcl" $(TESTFLAGS)

shell: setup $(PROJECT)
@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
@set TDBC_LIBRARY=$(LIBDIR:\=/)
!if $(TCLINSTALL)
@set PATH=$(_TCLDIR)\bin;$(PATH)
@set PATH=$(_TCLDIR)\bin;$(PATH)
!else
@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
!endif
$(DEBUGGER) $(TCLSH) $(SCRIPT)
$(DEBUGGER) $(TCLSH) $(SCRIPT)

setup:
@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
Expand Down

0 comments on commit 79035e3

Please sign in to comment.