diff --git a/GLC_lib/src/lib/io/glc_3dstoworld.cpp b/GLC_lib/src/lib/io/glc_3dstoworld.cpp index 0de8c2e..32b904c 100644 --- a/GLC_lib/src/lib/io/glc_3dstoworld.cpp +++ b/GLC_lib/src/lib/io/glc_3dstoworld.cpp @@ -36,11 +36,11 @@ #include "../sceneGraph/glc_structoccurrence.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 +#include +#include +#include +#include #include diff --git a/GLC_lib/src/lib/io/glc_3dxmltoworld.cpp b/GLC_lib/src/lib/io/glc_3dxmltoworld.cpp index 3522ab0..962cd78 100644 --- a/GLC_lib/src/lib/io/glc_3dxmltoworld.cpp +++ b/GLC_lib/src/lib/io/glc_3dxmltoworld.cpp @@ -30,8 +30,8 @@ #include "glc_xmlutil.h" // Quazip library -#include "../3rdparty/quazip/quazip.h" -#include "../3rdparty/quazip/quazipfile.h" +#include +#include #include #include diff --git a/GLC_lib/src/lib/io/glc_worldto3ds.cpp b/GLC_lib/src/lib/io/glc_worldto3ds.cpp index 651c2ad..f0c03f8 100644 --- a/GLC_lib/src/lib/io/glc_worldto3ds.cpp +++ b/GLC_lib/src/lib/io/glc_worldto3ds.cpp @@ -31,11 +31,11 @@ #include "../shading/glc_material.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 +#include +#include +#include +#include #include "glc_worldto3ds.h" diff --git a/GLC_lib/src/lib/io/glc_worldto3dxml.cpp b/GLC_lib/src/lib/io/glc_worldto3dxml.cpp index dbe52dc..11fdac0 100644 --- a/GLC_lib/src/lib/io/glc_worldto3dxml.cpp +++ b/GLC_lib/src/lib/io/glc_worldto3dxml.cpp @@ -23,8 +23,8 @@ #include "glc_worldto3dxml.h" // Quazip library -#include "../3rdparty/quazip/quazip.h" -#include "../3rdparty/quazip/quazipfile.h" +#include +#include #include "../glc_exception.h" #include "../geometry/glc_mesh.h" diff --git a/GLC_lib/src/lib/lib.pro b/GLC_lib/src/lib/lib.pro index 65e3cb9..8ca72bc 100644 --- a/GLC_lib/src/lib/lib.pro +++ b/GLC_lib/src/lib/lib.pro @@ -17,8 +17,6 @@ DESTDIR = ./ VERSION = 3.0.0 DEFINES += CREATE_GLC_LIB_DLL -DEFINES += QUAZIP_BUILD -DEFINES += LIB3DS_EXPORTS DEFINES += _CRT_SECURE_NO_WARNINGS OBJECTS_DIR = ./Build @@ -28,53 +26,13 @@ RCC_DIR = ./Build DEPENDPATH += . INCLUDEPATH += . -INCLUDEPATH += ./3rdparty/zlib -INCLUDEPATH += ./3rdparty/quazip +INCLUDEPATH += /usr/include/quazip5 +INCLUDEPATH += /usr/include/lib3ds RESOURCES += glc_lib.qrc # Input -HEADERS_QUAZIP += \ - 3rdparty/quazip/minizip_crypt.h \ - 3rdparty/quazip/ioapi.h \ - 3rdparty/quazip/JlCompress.h \ - 3rdparty/quazip/quaadler32.h \ - 3rdparty/quazip/quachecksum32.h \ - 3rdparty/quazip/quacrc32.h \ - 3rdparty/quazip/quagzipfile.h \ - 3rdparty/quazip/quaziodevice.h \ - 3rdparty/quazip/quazipdir.h \ - 3rdparty/quazip/quazipfile.h \ - 3rdparty/quazip/quazipfileinfo.h \ - 3rdparty/quazip/quazip_global.h \ - 3rdparty/quazip/quazip.h \ - 3rdparty/quazip/quazipnewinfo.h \ - 3rdparty/quazip/unzip.h \ - 3rdparty/quazip/zip.h - - -HEADERS_LIB3DS += 3rdparty/lib3ds/atmosphere.h \ - 3rdparty/lib3ds/background.h \ - 3rdparty/lib3ds/camera.h \ - 3rdparty/lib3ds/chunk.h \ - 3rdparty/lib3ds/chunktable.h \ - 3rdparty/lib3ds/ease.h \ - 3rdparty/lib3ds/file.h \ - 3rdparty/lib3ds/io.h \ - 3rdparty/lib3ds/light.h \ - 3rdparty/lib3ds/material.h \ - 3rdparty/lib3ds/matrix.h \ - 3rdparty/lib3ds/mesh.h \ - 3rdparty/lib3ds/node.h \ - 3rdparty/lib3ds/quat.h \ - 3rdparty/lib3ds/shadow.h \ - 3rdparty/lib3ds/tcb.h \ - 3rdparty/lib3ds/tracks.h \ - 3rdparty/lib3ds/types.h \ - 3rdparty/lib3ds/vector.h \ - 3rdparty/lib3ds/viewport.h - HEADERS_GLEXT += 3rdparty/glext/glext.h HEADERS_CLIP2TR += 3rdparty/clip2tri/clip2tri/clip2tri.h \ @@ -242,70 +200,10 @@ HEADERS_GLC_QML += qml/glc_quickitem.h \ HEADERS_GLC_CSGJS += 3rdparty/csgjs/csgjs.h - -HEADERS_ZLIB += 3rdparty/zlib/crc32.h \ - 3rdparty/zlib/deflate.h \ - 3rdparty/zlib/inffast.h \ - 3rdparty/zlib/inffixed.h \ - 3rdparty/zlib/inflate.h \ - 3rdparty/zlib/inftrees.h \ - 3rdparty/zlib/trees.h \ - 3rdparty/zlib/zconf.h \ - 3rdparty/zlib/zconf.in.h \ - 3rdparty/zlib/zlib.h \ - 3rdparty/zlib/zutil.h - -HEADERS += $${HEADERS_QUAZIP} $${HEADERS_LIB3DS} $${HEADERS_GLC_MATHS} $${HEADERS_GLC_IO} +HEADERS += $${HEADERS_GLC_MATHS} $${HEADERS_GLC_IO} HEADERS += $${HEADERS_GLC} $${HEADERS_GLEXT} $${HEADERS_GLC_SCENEGRAPH} $${HEADERS_GLC_GEOMETRY} HEADERS += $${HEADERS_GLC_SHADING} $${HEADERS_GLC_VIEWPORT} $${HEADERS_GLC_3DWIDGET} $${HEADERS_GLC_GLU} -HEADERS += $${HEADERS_GLC_QML} $${HEADERS_CLIP2TR} $${HEADERS_GLC_CSGJS} $${HEADERS_ZLIB} - -SOURCES += 3rdparty/zlib/adler32.c \ - 3rdparty/zlib/compress.c \ - 3rdparty/zlib/crc32.c \ - 3rdparty/zlib/deflate.c \ - 3rdparty/zlib/gzio.c \ - 3rdparty/zlib/inffast.c \ - 3rdparty/zlib/inflate.c \ - 3rdparty/zlib/inftrees.c \ - 3rdparty/zlib/trees.c \ - 3rdparty/zlib/uncompr.c \ - 3rdparty/zlib/zutil.c - - -SOURCES += 3rdparty/quazip/qioapi.cpp \ - 3rdparty/quazip/JlCompress.cpp \ - 3rdparty/quazip/quaadler32.cpp \ - 3rdparty/quazip/quacrc32.cpp \ - 3rdparty/quazip/quagzipfile.cpp \ - 3rdparty/quazip/quaziodevice.cpp \ - 3rdparty/quazip/quazip.cpp \ - 3rdparty/quazip/quazipdir.cpp \ - 3rdparty/quazip/quazipfile.cpp \ - 3rdparty/quazip/quazipfileinfo.cpp \ - 3rdparty/quazip/quazipnewinfo.cpp \ - 3rdparty/quazip/unzip.c \ - 3rdparty/quazip/zip.c - -SOURCES += 3rdparty/lib3ds/atmosphere.c \ - 3rdparty/lib3ds/background.c \ - 3rdparty/lib3ds/camera.c \ - 3rdparty/lib3ds/chunk.c \ - 3rdparty/lib3ds/ease.c \ - 3rdparty/lib3ds/file.c \ - 3rdparty/lib3ds/io.c \ - 3rdparty/lib3ds/light.c \ - 3rdparty/lib3ds/material.c \ - 3rdparty/lib3ds/matrix.c \ - 3rdparty/lib3ds/mesh.c \ - 3rdparty/lib3ds/node.c \ - 3rdparty/lib3ds/quat.c \ - 3rdparty/lib3ds/shadow.c \ - 3rdparty/lib3ds/tcb.c \ - 3rdparty/lib3ds/tracks.c \ - 3rdparty/lib3ds/vector.c \ - 3rdparty/lib3ds/viewport.c - +HEADERS += $${HEADERS_GLC_QML} $${HEADERS_CLIP2TR} $${HEADERS_GLC_CSGJS} SOURCES += 3rdparty/clip2tri/clip2tri/clip2tri.cpp \ 3rdparty/clip2tri/clipper/clip_clipper.cpp \ @@ -596,10 +494,7 @@ HEADERS_INST = GLC_BoundingBox \ include (../../install.pri) include.path = $${INCLUDE_DIR} -include_lib3ds.path = $${INCLUDE_DIR}/3rdparty/lib3ds include_glext.path = $${INCLUDE_DIR}/3rdparty/glext -include_quazip.path = $${INCLUDE_DIR}/3rdparty/quazip -include_zlib.path = $${INCLUDE_DIR}/3rdparty/zlib include_glc_maths.path = $${INCLUDE_DIR}/maths include_glc_io.path = $${INCLUDE_DIR}/io include_glc_scengraph.path = $${INCLUDE_DIR}/sceneGraph @@ -611,10 +506,7 @@ include_glc_glu.path = $${INCLUDE_DIR}/glu include_glc_qml.path = $${INCLUDE_DIR}/qml include.files = $${HEADERS_GLC} $${HEADERS_INST} -include_lib3ds.files = $${HEADERS_LIB3DS} include_glext.files =$${HEADERS_GLEXT} -include_quazip.files = $${HEADERS_QUAZIP} -include_zlib.files = $${HEADERS_ZLIB} include_glc_maths.files= $${HEADERS_GLC_MATHS} include_glc_io.files= $${HEADERS_GLC_IO} include_glc_scengraph.files= $${HEADERS_GLC_SCENEGRAPH} @@ -629,7 +521,7 @@ include_glc_qml.files = $${HEADERS_GLC_QML} target.path = $${LIB_DIR} # "make install" configuration options -INSTALLS += include_lib3ds include_glext include_quazip include_zlib include_glc_maths include_glc_io +INSTALLS += include_glext include_glc_maths include_glc_io INSTALLS += include_glc_scengraph include_glc_geometry include_glc_shading include_glc_viewport INSTALLS += include_glc_3dwidget include_glc_glu include_glc_qml diff --git a/GLC_lib/src/lib/shading/glc_texture.cpp b/GLC_lib/src/lib/shading/glc_texture.cpp index d08dd26..4a1e7bf 100644 --- a/GLC_lib/src/lib/shading/glc_texture.cpp +++ b/GLC_lib/src/lib/shading/glc_texture.cpp @@ -28,8 +28,8 @@ #include "../glc_global.h" // Quazip library -#include "../quazip/quazip.h" -#include "../quazip/quazipfile.h" +#include +#include #include --- -2.33.0 -