diff options
| author | Adam Tkac <atkac@redhat.com> | 2010-11-25 14:01:59 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2010-11-25 14:01:59 +0000 |
| commit | 5b1d8503b860151171544f1be20940a38eeb0c33 (patch) | |
| tree | eaf5b4d93560cb36a14fc5259772eca0ba976403 | |
| parent | 96c5df3da79d10e93a7b12cde7220f756e6f444c (diff) | |
| download | tigervnc-5b1d8503b860151171544f1be20940a38eeb0c33.tar.gz tigervnc-5b1d8503b860151171544f1be20940a38eeb0c33.zip | |
[Bugfix] Fix MinGW-based Windows builds.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4207 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | win/resdefs.h.in | 1 | ||||
| -rw-r--r-- | win/vncconfig/Makefile.am | 2 | ||||
| -rw-r--r-- | win/vncviewer/Makefile.am | 2 | ||||
| -rw-r--r-- | win/winvnc/Makefile.am | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 1909e336..46a69866 100644 --- 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 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 $@ |