ALT Linux Sisyphus

diff -up GLC_lib-2.2.0/glc_lib/glc_ext.h.nointernal GLC_lib-2.2.0/glc_lib/glc_ext.h

--- GLC_lib-2.2.0/glc_lib/glc_ext.h.nointernal	2011-06-19 17:16:30.000000000 +0200
+++ GLC_lib-2.2.0/glc_lib/glc_ext.h	2011-07-25 11:57:00.855774006 +0200
@@ -25,7 +25,7 @@
 #define GLC_EXT_H_
 
 #include <QtOpenGL>
-#include "3rdparty/glext/glext.h"
+#include <GL/glext.h>
 
 // Buffer offset used by VBO
 #define BUFFER_OFFSET(i) ((char*)NULL + (i))
diff -up GLC_lib-2.2.0/glc_lib/GLC_lib.pro.nointernal GLC_lib-2.2.0/glc_lib/GLC_lib.pro
--- GLC_lib-2.2.0/glc_lib/GLC_lib.pro.nointernal	2011-06-19 17:16:28.000000000 +0200
+++ GLC_lib-2.2.0/glc_lib/GLC_lib.pro	2011-07-25 11:59:13.591774007 +0200
@@ -5,7 +5,9 @@ QT += opengl \
 
 
 CONFIG += exceptions \
-    warn_on
+    warn_on \
+    link_pkgconfig
+
 TARGET = GLC_lib
 VERSION = 2.2.0
 
@@ -14,6 +16,9 @@ DEFINES += LIB3DS_EXPORTS
 
 DEFINES += _CRT_SECURE_NO_WARNINGS
 
+PKGCONFIG = lib3ds minizip
+LIBS += -lquazip
+
 unix:OBJECTS_DIR = ./Build
 unix:MOC_DIR = ./Build
 unix:UI_DIR = ./Build
@@ -171,11 +176,11 @@ HEADERS_GLC_3DWIDGET += 3DWidget/glc_3dw
 						3DWidget/glc_axis.h
 
 
-HEADERS += $${HEADERS_QUAZIP} $${HEADERS_LIB3DS} $${HEADERS_GLC_MATHS} $${HEADERS_GLC_IO}
-HEADERS += $${HEADERS_GLC} $${HEADERS_GLEXT} $${HEADERS_GLC_SCENEGRAPH} $${HEADERS_GLC_GEOMETRY}
+HEADERS += $${HEADERS_GLC_MATHS} $${HEADERS_GLC_IO}
+HEADERS += $${HEADERS_GLC} $${HEADERS_GLC_SCENEGRAPH} $${HEADERS_GLC_GEOMETRY}
 HEADERS += $${HEADERS_GLC_SHADING} $${HEADERS_GLC_VIEWPORT} $${HEADERS_GLC_3DWIDGET}
 		   
-SOURCES += 3rdparty/zlib/adler32.c \
+TRASH_SOURCES_ += 3rdparty/zlib/adler32.c \
            3rdparty/zlib/compress.c \
            3rdparty/zlib/crc32.c \
            3rdparty/zlib/deflate.c \
@@ -187,14 +192,14 @@ SOURCES += 3rdparty/zlib/adler32.c \
            3rdparty/zlib/uncompr.c \
            3rdparty/zlib/zutil.c
 
-SOURCES += 3rdparty/quazip/ioapi.c \
+TRASH_SOURCES += 3rdparty/quazip/ioapi.c \
            3rdparty/quazip/quazip.cpp \
            3rdparty/quazip/quazipfile.cpp \
            3rdparty/quazip/quazipnewinfo.cpp \
            3rdparty/quazip/unzip.c \
            3rdparty/quazip/zip.c
 
-SOURCES += 3rdparty/lib3ds/atmosphere.c \
+TRASH_SOURCES += 3rdparty/lib3ds/atmosphere.c \
            3rdparty/lib3ds/background.c \
            3rdparty/lib3ds/camera.c \
            3rdparty/lib3ds/chunk.c \
@@ -428,10 +433,7 @@ unix {
     INCLUDE_DIR = /usr/local/include
     # Adds a -P to preserve link
 	QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
-	include.path = $${INCLUDE_DIR}/GLC_lib
-	include_lib3ds.path = $${INCLUDE_DIR}/GLC_lib/3rdparty/lib3ds
-	include_glext.path = $${INCLUDE_DIR}/GLC_lib/3rdparty/glext
-	include_quazip.path = $${INCLUDE_DIR}/GLC_lib/3rdparty/quazip
+	include.path = $${INCLUDE_DIR}/GLC_lib -I/usr/include/minizip
 	include_glc_maths.path = $${INCLUDE_DIR}/GLC_lib/maths
 	include_glc_io.path = $${INCLUDE_DIR}/GLC_lib/io
 	include_glc_scengraph.path = $${INCLUDE_DIR}/GLC_lib/sceneGraph
@@ -460,9 +462,6 @@ win32 { 
 }    
 
 include.files = $${HEADERS_GLC} $${HEADERS_INST}
-include_lib3ds.files = $${HEADERS_LIB3DS}
-include_glext.files =$${HEADERS_GLEXT}
-include_quazip.files = $${HEADERS_QUAZIP}
 include_glc_maths.files= $${HEADERS_GLC_MATHS}
 include_glc_io.files= $${HEADERS_GLC_IO}
 include_glc_scengraph.files= $${HEADERS_GLC_SCENEGRAPH}
@@ -475,7 +474,7 @@ include_glc_3dwidget.files = $${HEADERS_
 target.path = $${LIB_DIR}
    
 # "make install" configuration options
-INSTALLS += include_lib3ds include_glext include_quazip include_glc_maths include_glc_io
+INSTALLS += include_glc_maths include_glc_io
 INSTALLS += include_glc_scengraph include_glc_geometry include_glc_shading include_glc_viewport
 INSTALLS += include_glc_3dwidget
 
diff -up GLC_lib-2.2.0/glc_lib/io/glc_3dstoworld.cpp.nointernal GLC_lib-2.2.0/glc_lib/io/glc_3dstoworld.cpp
--- GLC_lib-2.2.0/glc_lib/io/glc_3dstoworld.cpp.nointernal	2011-06-19 17:16:30.000000000 +0200
+++ GLC_lib-2.2.0/glc_lib/io/glc_3dstoworld.cpp	2011-07-25 11:57:00.856774006 +0200
@@ -36,11 +36,11 @@
 #include "../sceneGraph/glc_structoccurence.h"
 
 // Lib3ds Header
-#include "3rdparty/lib3ds/file.h"
-#include "3rdparty/lib3ds/mesh.h"
-#include "3rdparty/lib3ds/node.h"
-#include "3rdparty/lib3ds/matrix.h"
-#include "3rdparty/lib3ds/material.h"
+#include <lib3ds/file.h>
+#include <lib3ds/mesh.h>
+#include <lib3ds/node.h>
+#include <lib3ds/matrix.h>
+#include <lib3ds/material.h>
 
 #include <QFileInfo>
 #include <QGLContext>
diff -up GLC_lib-2.2.0/glc_lib/io/glc_3dxmltoworld.cpp.nointernal GLC_lib-2.2.0/glc_lib/io/glc_3dxmltoworld.cpp
--- GLC_lib-2.2.0/glc_lib/io/glc_3dxmltoworld.cpp.nointernal	2011-06-20 14:01:36.000000000 +0200
+++ GLC_lib-2.2.0/glc_lib/io/glc_3dxmltoworld.cpp	2011-07-25 11:57:00.858774006 +0200
@@ -30,8 +30,8 @@
 #include "glc_xmlutil.h"
 
 // Quazip library
-#include "../3rdparty/quazip/quazip.h"
-#include "../3rdparty/quazip/quazipfile.h"
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
 
 #include <QString>
 #include <QGLContext>