From e092b29faa1269648eb8fcddc2527428c2e4876b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 8 Sep 2019 13:26:00 +0000
Subject: dde and registry extension should be compiled with -DUNICODE
 -D_UNICODE. Put 64-bit builds before 32-bit builds in travis

---
 .travis.yml     | 72 ++++++++++++++++++++++++++++-----------------------------
 win/Makefile.in | 10 +++++++-
 2 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd6f31a..e1b8bd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -137,6 +137,42 @@ matrix:
         - BUILD_DIR=macosx
       install: []
       script: *mactest
+# Test with mingw-w64 cross-compile
+# Doesn't run tests because wine is only an imperfect Windows emulation
+    - name: "Linux-cross-Windows/GCC/Shared/no test"
+      os: linux
+      dist: xenial
+      compiler: x86_64-w64-mingw32-gcc
+      addons: &mingw64
+        apt:
+          packages:
+            - gcc-mingw-w64-base
+            - binutils-mingw-w64-x86-64
+            - gcc-mingw-w64-x86-64
+            - gcc-mingw-w64
+            - wine
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads"
+      script: *crosstest
+    - name: "Linux-cross-Windows/GCC/Static/no test"
+      os: linux
+      dist: xenial
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads --disable-shared"
+      script: *crosstest
+    - name: "Linux-cross-Windows/GCC/Debug/no test"
+      os: linux
+      dist: xenial
+      compiler: x86_64-w64-mingw32-gcc
+      addons: *mingw64
+      env:
+        - BUILD_DIR=win
+        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads --enable-symbols"
+      script: *crosstest
 # Test with mingw-w64 (32 bit) cross-compile
 # Doesn't run tests because wine is only an imperfect Windows emulation
     - name: "Linux-cross-Windows-32/GCC/Shared/no test"
@@ -178,42 +214,6 @@ matrix:
         - BUILD_DIR=win
         - CFGOPT="--host=i686-w64-mingw32 --enable-threads --enable-symbols"
       script: *crosstest
-# Test with mingw-w64 (64 bit)
-# Doesn't run tests because wine is only an imperfect Windows emulation
-    - name: "Linux-cross-Windows-64/GCC/Shared/no test"
-      os: linux
-      dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: &mingw64
-        apt:
-          packages:
-            - gcc-mingw-w64-base
-            - binutils-mingw-w64-x86-64
-            - gcc-mingw-w64-x86-64
-            - gcc-mingw-w64
-            - wine
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads"
-      script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Static/no test"
-      os: linux
-      dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads --disable-shared"
-      script: *crosstest
-    - name: "Linux-cross-Windows-64/GCC/Debug/no test"
-      os: linux
-      dist: xenial
-      compiler: x86_64-w64-mingw32-gcc
-      addons: *mingw64
-      env:
-        - BUILD_DIR=win
-        - CFGOPT="--host=x86_64-w64-mingw32 --enable-64bit --enable-threads --enable-symbols"
-      script: *crosstest
 # Test on Windows with MSVC native
     - name: "Windows/MSVC/Shared"
       os: windows
diff --git a/win/Makefile.in b/win/Makefile.in
index 6f2044f5..49ee104 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -498,7 +498,15 @@ tclWinInit.${OBJEXT}: tclWinInit.c
 	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
 tclWinPipe.${OBJEXT}: tclWinPipe.c
-	$(CC) -c $(CC_SWITCHES) -DBUILD_tcl -DTCL_PIPE_DLL=\"$(PIPE_DLL_FILE)\" \
+	$(CC) -c $(CC_SWITCHES) -D_BUILD_tcl -DTCL_PIPE_DLL=\"$(PIPE_DLL_FILE)\" \
+	    $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
+
+tclWinReg.${OBJEXT}: tclWinReg.c
+	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE
+	    $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
+
+tclWinDde.${OBJEXT}: tclWinDde.c
+	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE
 	    $(EXTFLAGS) @DEPARG@ $(CC_OBJNAME)
 
 testMain.${OBJEXT}: tclAppInit.c
-- 
cgit v0.12