[Bugfix] Fix MinGW-based Windows builds.

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

diff --git a/configure.ac b/configure.ac
index 1909e33656bad8f89809e5b3a2f22a56124bfcd6..46a698660683245fafd0777b519511e2ce9b3a72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.57])
+
+dnl Modify also RCVERSION variable when modifying release
 AC_INIT([tigervnc], [1.0.90], [http://www.tigervnc.org])
+RCVERSION="1,0,90,0"
+AC_SUBST([RCVERSION])
+
 BUILD=`date +%Y%m%d`
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([-Wall foreign dist-bzip2])
@@ -35,12 +40,15 @@ esac
 
 BUILD_WIN=
 case "$host_os" in
-mingw*)
+mingw32*)
        CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_IE=0x0500"
        CXXFLAGS="$CXXFLAGS -mthreads"
        BUILD_WIN=yes
        AC_CHECK_TOOL([WINDRES], windres, [AC_MSG_ERROR(windres not found)])
        ;;
+mingw*)
+       AC_MSG_ERROR(["Only 32bit MinGW builds are supported"])
+       ;;
 esac
 AM_CONDITIONAL([BUILD_WIN], [test "x$BUILD_WIN" = xyes])
 if test "x$BUILD_WIN" = xyes; then
@@ -224,5 +232,6 @@ win/vncviewer/Makefile
 win/rfb_win32/Makefile
 win/vncconfig/Makefile
 win/winvnc/Makefile
+win/resdefs.h
 po/Makefile.in
 ])

diff --git a/win/resdefs.h.in b/win/resdefs.h.in
index b61db53e838ad20331a2d3134a9fc47cc626b56f..e86a92d31010900535eb1f9f1d576e050f2f244f 100644 (file)
--- 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 a392386cb121585023fdf621bb5cc043134b7a24..5665ac44233ada3ecba011bb245a1fd49fabef83 100644 (file)
--- 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 d19634ec8462e7f6124cfd310326da2d23c03e2a..d618738a78735c0d5059811c16c7880228927f5c 100644 (file)
--- 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 dabfde2919d125ed91e8793c576d6bf8f49e6d17..736a7a995fbdd11f3658e9482c995e44cfd157f4 100644 (file)
--- 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 $@