[GLC_lib] Fix glu at link time
Nicolas Chauvet
kwizart at fedoraproject.org
Sun Aug 21 21:53:36 UTC 2011
commit ea2bcf8f06edce40707132599b8135346eae7529
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Sun Aug 21 23:53:05 2011 +0200
Fix glu at link time
GLC_lib.spec | 4 ++--
GLC_lib_src_2.2.0-gcc46.patch | 18 +++++++++++++++---
2 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/GLC_lib.spec b/GLC_lib.spec
index e61ed03..0e86ccc 100644
--- a/GLC_lib.spec
+++ b/GLC_lib.spec
@@ -1,6 +1,6 @@
Name: GLC_lib
Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: C++ class library for OpenGL application based on Qt 4
Group: System Environment/Libraries
@@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Aug 21 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.2.0-2
+* Sun Aug 21 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.2.0-3
- Fix with gcc46
* Mon Jul 25 2011 Nicolas Chauvet <kwizart at gmail.com> - 2.2.0-1
diff --git a/GLC_lib_src_2.2.0-gcc46.patch b/GLC_lib_src_2.2.0-gcc46.patch
index 09bb1f3..399eb7d 100644
--- a/GLC_lib_src_2.2.0-gcc46.patch
+++ b/GLC_lib_src_2.2.0-gcc46.patch
@@ -1,6 +1,18 @@
+diff -up GLC_lib-2.2.0/glc_lib/GLC_lib.pro.gcc46 GLC_lib-2.2.0/glc_lib/GLC_lib.pro
+--- GLC_lib-2.2.0/glc_lib/GLC_lib.pro.gcc46 2011-08-21 22:07:22.631900646 +0200
++++ GLC_lib-2.2.0/glc_lib/GLC_lib.pro 2011-08-21 23:50:45.857823280 +0200
+@@ -17,7 +17,7 @@ DEFINES += LIB3DS_EXPORTS
+ DEFINES += _CRT_SECURE_NO_WARNINGS
+
+ PKGCONFIG = lib3ds minizip
+-LIBS += -lquazip
++LIBS += -lquazip -lglu
+
+ unix:OBJECTS_DIR = ./Build
+ unix:MOC_DIR = ./Build
diff -up GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp.gcc46 GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp
--- GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp.gcc46 2011-06-19 17:16:32.000000000 +0200
-+++ GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp 2011-08-21 20:53:07.376302723 +0200
++++ GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp 2011-08-21 22:07:22.603896218 +0200
@@ -27,6 +27,7 @@
#include "../glc_factory.h"
@@ -11,7 +23,7 @@ diff -up GLC_lib-2.2.0/glc_lib/shading/glc_material.cpp.gcc46 GLC_lib-2.2.0/glc_
quint32 GLC_Material::m_ChunkId= 0xA703;
diff -up GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp.gcc46 GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp
--- GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp.gcc46 2011-06-19 17:16:32.000000000 +0200
-+++ GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp 2011-08-21 20:54:56.663588066 +0200
++++ GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp 2011-08-21 22:07:22.604896376 +0200
@@ -26,6 +26,7 @@
#include "glc_camera.h"
@@ -22,7 +34,7 @@ diff -up GLC_lib-2.2.0/glc_lib/viewport/glc_camera.cpp.gcc46 GLC_lib-2.2.0/glc_l
//////////////////////////////////////////////////////////////////////
diff -up GLC_lib-2.2.0/glc_lib/viewport/glc_viewport.cpp.gcc46 GLC_lib-2.2.0/glc_lib/viewport/glc_viewport.cpp
--- GLC_lib-2.2.0/glc_lib/viewport/glc_viewport.cpp.gcc46 2011-06-19 17:16:32.000000000 +0200
-+++ GLC_lib-2.2.0/glc_lib/viewport/glc_viewport.cpp 2011-08-21 20:55:31.104035246 +0200
++++ GLC_lib-2.2.0/glc_lib/viewport/glc_viewport.cpp 2011-08-21 22:07:22.605896534 +0200
@@ -31,6 +31,7 @@
#include "../sceneGraph/glc_3dviewinstance.h"
More information about the scm-commits
mailing list