Revision: 4207
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4207&view=rev
Author: atkac
Date: 2010-11-25 14:01:59 +0000 (Thu, 25 Nov 2010)
Log Message:
-----------
[Bugfix] Fix MinGW-based Windows builds.
Modified Paths:
--------------
trunk/configure.ac
trunk/win/resdefs.h.in
trunk/win/vncconfig/Makefile.am
trunk/win/vncviewer/Makefile.am
trunk/win/winvnc/Makefile.am
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2010-11-25 14:00:51 UTC (rev 4206)
+++ trunk/configure.ac 2010-11-25 14:01:59 UTC (rev 4207)
@@ -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 @@
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/rfb_win32/Makefile
win/vncconfig/Makefile
win/winvnc/Makefile
+win/resdefs.h
po/Makefile.in
])
Modified: trunk/win/resdefs.h.in
===================================================================
--- trunk/win/resdefs.h.in 2010-11-25 14:00:51 UTC (rev 4206)
+++ trunk/win/resdefs.h.in 2010-11-25 14:01:59 UTC (rev 4207)
@@ -1,4 +1,3 @@
#define __VERSIONSTR "@vers...@\0"
#define __RCVERSION @RCVERSION@
#define __RCVERSIONSTR "@rcvers...@\0"
-#cmakedefine WIN64
Modified: trunk/win/vncconfig/Makefile.am
===================================================================
--- trunk/win/vncconfig/Makefile.am 2010-11-25 14:00:51 UTC (rev 4206)
+++ trunk/win/vncconfig/Makefile.am 2010-11-25 14:01:59 UTC (rev 4207)
@@ -18,4 +18,4 @@
vncconfig.exe.manifest64 CMakeLists.txt
resources.o: vncconfig.rc
- $(WINDRES) $^ -o $@
+ $(WINDRES) -I$(top_builddir)/win $^ -o $@
Modified: trunk/win/vncviewer/Makefile.am
===================================================================
--- trunk/win/vncviewer/Makefile.am 2010-11-25 14:00:51 UTC (rev 4206)
+++ trunk/win/vncviewer/Makefile.am 2010-11-25 14:01:59 UTC (rev 4207)
@@ -45,4 +45,4 @@
vncviewer.exe.manifest64 vncviewer.bmp toolbar.bmp CMakeLists.txt
resources.o: vncviewer.rc
- $(WINDRES) $^ -o $@
+ $(WINDRES) -I$(top_builddir)/win $^ -o $@
Modified: trunk/win/winvnc/Makefile.am
===================================================================
--- trunk/win/winvnc/Makefile.am 2010-11-25 14:00:51 UTC (rev 4206)
+++ trunk/win/winvnc/Makefile.am 2010-11-25 14:01:59 UTC (rev 4207)
@@ -24,4 +24,4 @@
CMakeLists.txt
resources.o: winvnc.rc
- $(WINDRES) $^ -o $@
+ $(WINDRES) -I$(top_builddir)/win $^ -o $@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
