Diff

Differences From Artifact [10214ad9a8]:

To Artifact [e8f807ace8]:


    50     50   	if [ ! -d '../buildsrc' ]; then
    51     51   		gzip -dc "../${SRC}" | tar -xf -
    52     52   	else    
    53     53   		cp -rp ../buildsrc/* './'
    54     54   	fi
    55     55   
    56     56   	cd "${BUILDDIR}" || exit 1
    57         -	for dir in unix win macosx __fail__; do
           57  +	for dir in unix win macosx win64 __fail__; do
    58     58   		if [ "${dir}" = "__fail__" ]; then
    59     59   			exit 1
    60     60   		fi
           61  +
           62  +		# Windows/amd64 workarounds
           63  +		win64="0"
           64  +		if [ "${dir}" = "win64" ]; then
           65  +			win64="1"
           66  +			dir="win"
           67  +		fi
    61     68   
    62     69   		# Remove previous directory's "tkConfig.sh" if found
    63     70   		rm -f 'tkConfig.sh'
    64     71   
    65     72   		cd "${BUILDDIR}/${dir}" || exit 1
    66     73   
    67     74   		if [ "${dir}" = "win" ]; then
    68     75   			# Statically link Tk to Tclkit if we are compiling for
    69     76   			# Windows
    70     77   			STATICTK="1"
           78  +
           79  +			if [ "${win64}" = "1" ]; then
           80  +				# Mingw32 for AMD64 requires this, apparently
           81  +				CPPFLAGS="${CPPFLAGS} -D_WIN32_IE=0x0501"
           82  +				CFLAGS="${CFLAGS} -D_WIN32_IE=0x0501"
           83  +				export CPPFLAGS CFLAGS
           84  +			fi
    71     85   		fi
    72     86   
    73     87   		if [ "${STATICTK}" = "1" ]; then
    74     88   			echo "Running: ./configure --disable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"
    75     89   			./configure --disable-shared --disable-symbols --prefix="${INSTDIR}" --with-tcl="${TCLCONFIGDIR}" ${CONFIGUREEXTRA}
    76     90   		else
    77     91   			echo "Running: ./configure --enable-shared --disable-symbols --prefix=\"${INSTDIR}\" --with-tcl=\"${TCLCONFIGDIR}\" ${CONFIGUREEXTRA}"