| 1 |
diff -up GLC_lib_src_1.1.0/glc_3dstoworld.cpp.nolib3ds GLC_lib_src_1.1.0/glc_3dstoworld.cpp
|
| 2 |
--- GLC_lib_src_1.1.0/glc_3dstoworld.cpp.nolib3ds 2009-02-28 20:16:16.000000000 +0100
|
| 3 |
+++ GLC_lib_src_1.1.0/glc_3dstoworld.cpp 2009-03-23 18:11:05.000000000 +0100
|
| 4 |
@@ -34,11 +34,11 @@
|
| 5 |
#include "glc_vector2df.h"
|
| 6 |
#include "glc_vector3df.h"
|
| 7 |
// Lib3ds Header
|
| 8 |
-#include "lib3ds/file.h"
|
| 9 |
-#include "lib3ds/mesh.h"
|
| 10 |
-#include "lib3ds/node.h"
|
| 11 |
-#include "lib3ds/matrix.h"
|
| 12 |
-#include "lib3ds/material.h"
|
| 13 |
+#include <lib3ds/file.h>
|
| 14 |
+#include <lib3ds/mesh.h>
|
| 15 |
+#include <lib3ds/node.h>
|
| 16 |
+#include <lib3ds/matrix.h>
|
| 17 |
+#include <lib3ds/material.h>
|
| 18 |
|
| 19 |
#include <QFileInfo>
|
| 20 |
#include <QGLContext>
|
| 21 |
diff -up GLC_lib_src_1.1.0/GLC_lib.pro.nolib3ds GLC_lib_src_1.1.0/GLC_lib.pro
|
| 22 |
--- GLC_lib_src_1.1.0/GLC_lib.pro.nolib3ds 2009-03-02 21:02:22.000000000 +0100
|
| 23 |
+++ GLC_lib_src_1.1.0/GLC_lib.pro 2009-03-23 18:13:26.000000000 +0100
|
| 24 |
@@ -4,7 +4,9 @@ QT += opengl \
|
| 25 |
core
|
| 26 |
CONFIG += exceptions \
|
| 27 |
release \
|
| 28 |
- warn_on
|
| 29 |
+ warn_on \
|
| 30 |
+ link_pkgconfig
|
| 31 |
+
|
| 32 |
TARGET = GLC_lib
|
| 33 |
VERSION = 1.1.0
|
| 34 |
|
| 35 |
@@ -14,30 +16,8 @@ unix:UI_DIR = ./Build
|
| 36 |
|
| 37 |
DEPENDPATH += .
|
| 38 |
INCLUDEPATH += .
|
| 39 |
-
|
| 40 |
-# Input
|
| 41 |
-HEADERS_LIB3DS += lib3ds/atmosphere.h \
|
| 42 |
- lib3ds/background.h \
|
| 43 |
- lib3ds/camera.h \
|
| 44 |
- lib3ds/chunk.h \
|
| 45 |
- lib3ds/chunktable.h \
|
| 46 |
- lib3ds/ease.h \
|
| 47 |
- lib3ds/file.h \
|
| 48 |
- lib3ds/io.h \
|
| 49 |
- lib3ds/light.h \
|
| 50 |
- lib3ds/material.h \
|
| 51 |
- lib3ds/matrix.h \
|
| 52 |
- lib3ds/mesh.h \
|
| 53 |
- lib3ds/node.h \
|
| 54 |
- lib3ds/quat.h \
|
| 55 |
- lib3ds/shadow.h \
|
| 56 |
- lib3ds/tcb.h \
|
| 57 |
- lib3ds/tracks.h \
|
| 58 |
- lib3ds/types.h \
|
| 59 |
- lib3ds/vector.h \
|
| 60 |
- lib3ds/viewport.h
|
| 61 |
-
|
| 62 |
-HEADERS_GLEXT += glext/glext.h
|
| 63 |
+
|
| 64 |
+PKGCONFIG = lib3ds
|
| 65 |
|
| 66 |
HEADERS_GLC += glc_utils_maths.h \
|
| 67 |
glc_vector2d.h \
|
| 68 |
@@ -84,27 +64,8 @@ HEADERS_GLC += glc_utils_maths.h \
|
| 69 |
glc_shader.h \
|
| 70 |
glc_state.h
|
| 71 |
|
| 72 |
-HEADERS += $${HEADERS_LIB3DS} $${HEADERS_GLC} $${HEADERS_GLEXT}
|
| 73 |
+HEADERS += $${HEADERS_GLC}
|
| 74 |
|
| 75 |
-SOURCES += lib3ds/atmosphere.c \
|
| 76 |
- lib3ds/background.c \
|
| 77 |
- lib3ds/camera.c \
|
| 78 |
- lib3ds/chunk.c \
|
| 79 |
- lib3ds/ease.c \
|
| 80 |
- lib3ds/file.c \
|
| 81 |
- lib3ds/io.c \
|
| 82 |
- lib3ds/light.c \
|
| 83 |
- lib3ds/material.c \
|
| 84 |
- lib3ds/matrix.c \
|
| 85 |
- lib3ds/mesh.c \
|
| 86 |
- lib3ds/node.c \
|
| 87 |
- lib3ds/quat.c \
|
| 88 |
- lib3ds/shadow.c \
|
| 89 |
- lib3ds/tcb.c \
|
| 90 |
- lib3ds/tracks.c \
|
| 91 |
- lib3ds/vector.c \
|
| 92 |
- lib3ds/viewport.c
|
| 93 |
-
|
| 94 |
SOURCES += glc_vector4d.cpp \
|
| 95 |
glc_matrix4x4.cpp \
|
| 96 |
glc_interpolator.cpp \
|
| 97 |
@@ -197,8 +158,8 @@ unix {
|
| 98 |
# Adds a -P to preserve link
|
| 99 |
QMAKE_COPY_FILE = $${QMAKE_COPY_FILE} -P
|
| 100 |
include.path = $${INCLUDE_DIR}/GLC_lib
|
| 101 |
- include_lib3ds.path = $${INCLUDE_DIR}/GLC_lib/lib3ds
|
| 102 |
- include_glext.path = $${INCLUDE_DIR}/GLC_lib/glext
|
| 103 |
+ include_lib3ds.path = $${INCLUDE_DIR}
|
| 104 |
+ include_glext.path = $${INCLUDE_DIR}
|
| 105 |
}
|
| 106 |
|
| 107 |
# Windows Install configuration
|
| 108 |
@@ -219,5 +180,5 @@ include_glext.files =$${HEADERS_GLEXT}
|
| 109 |
target.path = $${LIB_DIR}
|
| 110 |
|
| 111 |
# "make install" configuration options
|
| 112 |
-INSTALLS += target include_lib3ds include_glext include
|
| 113 |
+INSTALLS += target include
|
| 114 |
|
Parent Directory
| 
Revision Log