Release version 2.6.4

QGLViewer/QGLViewer.pro

@@ -6,7 +6,7 @@
 
 TEMPLATE = lib
 TARGET = QGLViewer
-VERSION = 2.6.3
+VERSION = 2.6.4
 CONFIG *= qt opengl warn_on shared thread create_prl rtti no_keywords
 
 QGL_HEADERS = \

QGLViewer/config.h

@@ -6,7 +6,7 @@
 #ifndef QGLVIEWER_CONFIG_H
 #define QGLVIEWER_CONFIG_H
 
-#define QGLVIEWER_VERSION 0x020603
+#define QGLVIEWER_VERSION 0x020604
 
 // Needed for Qt < 4 (?)
 #ifndef QT_CLEAN_NAMESPACE

QGLViewer/qglviewer.spec

@@ -1,7 +1,7 @@
 
 %define version_major 2
 %define version_minor 6
-%define version_revision 3
+%define version_revision 4
 
 Name:		libQGLViewer
 Version:	%{version_major}.%{version_minor}.%{version_revision}
@@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 %{docDir}/examples/*/*
 
 %changelog
+* Tue Sep 27 2016 Gilles Debunne <[email protected]> 2.6.4
+- Fix ARM build, remove contribs examples' compilation.
+
 * Thu Jul 16 2015 Gilles Debunne <[email protected]> 2.6.3
 - Build library in QGLViewer directory. Simplified examples.pri.
 

doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = libQGLViewer
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "Version 2.6.3"
+PROJECT_NUMBER         = "Version 2.6.4"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1285,7 +1285,7 @@ QCH_FILE               =
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_NAMESPACE          = com.libqglviewer.2.6.3
+QHP_NAMESPACE          = com.libqglviewer.2.6.4
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual

doc/changeLog.html

@@ -38,6 +38,9 @@ <h2>Jul 16th 2016 - 2.6.4</h2>
 <ul>
   <li>Add a <code>-qt4</code> or <code>-qt5</code> suffix to library file name on Linux. Fixes #18 (thanks Laurent).</li>
   <li>Edit the .pro of the examples to support the debug version of the library on Windows. Fixes #23 (thanks naubry).</li>
+  <li><code>contribs</code> examples no longer build by default. Relied on deprecated GL calls (Fixes #31)</li>
+  <li>Add <code>QMAKE_MAC_SDK</code> to fix compilation on Mac with recent XCode versions</li>
+  <li>Fix compilation errors on ARMv7, when `qreal` is defined to `float` (Pull request from lrineau)</li>
 </ul>
 
 

doc/index.html

@@ -91,6 +91,12 @@ <h2>Latest changes</h2>
 
 <table style="width:90%; margin-left:50px; border:1px solid #AAF; background-color:#DDE" cellspacing="8" cellpadding="8">
 
+<tr>
+  <td><b>Sep 27th, 2016</b><br/><a href="changeLog.html">Version 2.6.4</a></td>
+  <td>Fix ARM build, remove <code>contribs<code> examples' compilation.</td>
+</tr>
+
+
 <tr>
   <td><b>Jun 23rd, 2015</b><br/><a href="changeLog.html">Version 2.6.3</a></td>
   <td>The library is now always built in the <code>QGLViewer</code> directory.</td>

libQGLViewer.nsi

@@ -13,7 +13,7 @@ Name libQGLViewer
 
 # Defines
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 2.6.3
+!define VERSION 2.6.4
 !define COMPANY "Gilles Debunne"
 !define URL http://www.libqglviewer.com/
 
@@ -66,7 +66,7 @@ InstallDir $PROGRAMFILES\libQGLViewer
 CRCCheck on
 XPStyle on
 ShowInstDetails show
-VIProductVersion 2.6.3
+VIProductVersion 2.6.4
 VIAddVersionKey /LANG=${LANG_ENGLISH} ProductName "${NAME}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} ProductVersion "${VERSION}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyName "${COMPANY}"

makeDist

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 libName="libQGLViewer"
-version="2.6.3"
+version="2.6.4"
 
 WebURL="http://www.libqglviewer.com"