[Bugfix] Fix MinGW-based Windows builds.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4207 3789f03b-4d11-0410-bbf8-ca57d06f2519

4 files changed, 3 insertions, 4 deletions

diff --git a/win/resdefs.h.in b/win/resdefs.h.in
index b61db53e..e86a92d3 100644
--- a/win/resdefs.h.in
+++ b/win/resdefs.h.in
@@ -1,4 +1,3 @@
 #define __VERSIONSTR "@VERSION@\0"
 #define __RCVERSION @RCVERSION@
 #define __RCVERSIONSTR "@RCVERSION@\0"
-#cmakedefine WIN64
diff --git a/win/vncconfig/Makefile.am b/win/vncconfig/Makefile.am
index a392386c..5665ac44 100644
--- a/win/vncconfig/Makefile.am
+++ b/win/vncconfig/Makefile.am
@@ -18,4 +18,4 @@ EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest \
 	vncconfig.exe.manifest64 CMakeLists.txt
 
 resources.o: vncconfig.rc
-	$(WINDRES) $^ -o $@
+	$(WINDRES) -I$(top_builddir)/win $^ -o $@
diff --git a/win/vncviewer/Makefile.am b/win/vncviewer/Makefile.am
index d19634ec..d618738a 100644
--- a/win/vncviewer/Makefile.am
+++ b/win/vncviewer/Makefile.am
@@ -45,4 +45,4 @@ EXTRA_DIST = vncviewer.rc vncviewer.ico cursor1.cur vncviewer.exe.manifest \
 	vncviewer.exe.manifest64 vncviewer.bmp toolbar.bmp CMakeLists.txt
 
 resources.o: vncviewer.rc
-	$(WINDRES) $^ -o $@
+	$(WINDRES) -I$(top_builddir)/win $^ -o $@
diff --git a/win/winvnc/Makefile.am b/win/winvnc/Makefile.am
index dabfde29..736a7a99 100644
--- a/win/winvnc/Makefile.am
+++ b/win/winvnc/Makefile.am
@@ -24,4 +24,4 @@ EXTRA_DIST = winvnc.rc winvnc.ico connected.ico icon_dis.ico connecte.ico \
 	CMakeLists.txt
 
 resources.o: winvnc.rc
-	$(WINDRES) $^ -o $@
+	$(WINDRES) -I$(top_builddir)/win $^ -o $@