build: fix make install include path

* now we can include library headers like this: #include <cglm/cglm.h>
win: add version header to project
2026-02-17 03:39:05 +00:00 · 2017-05-21 13:39:38 +03:00 · 2017-05-21 12:36:31 +03:00 · 2017-05-21 12:28:06 +03:00
12 changed files with 68 additions and 32 deletions
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,12 +6,15 @@
 # Full license can be found in the LICENSE file
 #

-cd `dirname "$0"`
+cd $(dirname "$0")

-if [ "`uname`" = "Darwin" ]; then
-  libtoolBin=$(which glibtoolize)
-  libtoolBinDir=$(dirname "${libtoolBin}")
-  ln -s $libtoolBin "${libtoolBinDir}/libtoolize"
+if [ "$(uname)" = "Darwin" ]; then
+libtoolBin=$(which glibtoolize)
+libtoolBinDir=$(dirname "${libtoolBin}")
+
+if [ ! -f "${libtoolBinDir}/libtoolize" ]; then
+ln -s $libtoolBin "${libtoolBinDir}/libtoolize"
+fi
 fi

 autoheader
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 #*****************************************************************************

 AC_PREREQ([2.69])
-AC_INIT([cglm], [0.2.0], [info@recp.me])
+AC_INIT([cglm], [0.2.1], [info@recp.me])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])

 AC_CONFIG_MACRO_DIR([m4])
--- a/include/call/cglmc-mat.h
+++ b/include/call/cglmc-mat.h
@@ -13,6 +13,10 @@ extern "C" {

 #include "../cglm.h"

+/* DEPRECATED! use _copy, _ucopy versions */
+#define glmc_mat4_udup(mat, dest) glmc_mat4_ucopy(mat, dest)
+#define glmc_mat4_dup(mat, dest)  glmc_mat4_copy(mat, dest)
+
 CGLM_EXPORT
 void
 glmc_mat4_ucopy(mat4 mat, mat4 dest);
--- a/include/call/cglmc-mat3.h
+++ b/include/call/cglmc-mat3.h
@@ -13,6 +13,9 @@ extern "C" {

 #include "../cglm.h"

+/* DEPRECATED! use _copy, _ucopy versions */
+#define glmc_mat3_dup(mat, dest)  glmc_mat3_copy(mat, dest)
+
 CGLM_EXPORT
 void
 glmc_mat3_copy(mat3 mat, mat3 dest);
--- a/include/call/cglmc-vec.h
+++ b/include/call/cglmc-vec.h
@@ -13,6 +13,11 @@ extern "C" {

 #include "../cglm.h"

+/* DEPRECATED! use _copy, _ucopy versions */
+#define glmc_vec_dup(v, dest)   glmc_vec_copy(v, dest)
+#define glmc_vec4_dup3(v, dest) glmc_vec4_copy3(v, dest)
+#define glmc_vec4_dup(v, dest)  glmc_vec4_copy(v, dest)
+
 CGLM_EXPORT
 void
 glmc_vec_copy(vec3 a, vec3 dest);
--- a/include/cglm-mat.h
+++ b/include/cglm-mat.h
@@ -33,6 +33,10 @@
 #define GLM_MAT4_IDENTITY (mat4)GLM_MAT4_IDENTITY_INIT
 #define GLM_MAT4_ZERO     (mat4)GLM_MAT4_ZERO_INIT

+/* DEPRECATED! use _copy, _ucopy versions */
+#define glm_mat4_udup(mat, dest) glm_mat4_ucopy(mat, dest)
+#define glm_mat4_dup(mat, dest)  glm_mat4_copy(mat, dest)
+
 /*!
 * @brief copy all members of [mat] to [dest]
 *
--- a/include/cglm-mat3.h
+++ b/include/cglm-mat3.h
@@ -23,6 +23,9 @@
 #define GLM_MAT3_IDENTITY (mat3)GLM_MAT3_IDENTITY_INIT
 #define GLM_MAT3_ZERO     (mat3)GLM_MAT3_ZERO_INIT

+/* DEPRECATED! use _copy, _ucopy versions */
+#define glm_mat3_dup(mat, dest) glm_mat3_copy(mat, dest)
+
 /*!
 * @brief copy all members of [mat] to [dest]
 *
--- a/include/cglm-vec.h
+++ b/include/cglm-vec.h
@@ -18,6 +18,11 @@
 #include "arch/simd/cglm-intrin.h"
 #include "cglm-util.h"

+/* DEPRECATED! use _copy, _ucopy versions */
+#define glm_vec_dup(v, dest)   glm_vec_copy(v, dest)
+#define glm_vec4_dup3(v, dest) glm_vec4_copy3(v, dest)
+#define glm_vec4_dup(v, dest)  glm_vec4_copy(v, dest)
+
 /*!
 * @brief copy all members of [a] to [dest]
 *
--- a/include/cglm-version.h
+++ b/include/cglm-version.h
@@ -10,6 +10,6 @@

 #define CGLM_VERSION_MAJOR 0
 #define CGLM_VERSION_MINOR 2
-#define CGLM_VERSION_PATCH 0
+#define CGLM_VERSION_PATCH 1

 #endif /* cglm_version_h */
--- a/makefile.am
+++ b/makefile.am
@@ -32,36 +32,41 @@ TESTS = $(check_PROGRAMS)
 test_test_mat4_LDFLAGS = $(checkLDFLAGS)
 test_test_mat4_CFLAGS  = $(checkCFLAGS)

-nobase_include_HEADERS = include/cglm-version.h \
-                         include/cglm.h \
-                         include/cglm-call.h \
-                         include/cglm-cam.h \
-                         include/cglm-io.h \
-                         include/cglm-mat3.h \
-                         include/cglm-types.h \
-                         include/cglm-common.h \
-                         include/cglm-affine.h \
-                         include/cglm-vec.h \
-                         include/cglm-euler.h \
-                         include/cglm-util.h \
-                         include/cglm-quat.h \
-                         include/cglm-mat.h \
-                         include/cglm-affine-mat.h \
-                         include/arch/simd/cglm-mat-simd-avx.h \
+cglmdir=$(includedir)/cglm
+cglm_HEADERS = include/cglm-version.h \
+               include/cglm.h \
+               include/cglm-call.h \
+               include/cglm-cam.h \
+               include/cglm-io.h \
+               include/cglm-mat3.h \
+               include/cglm-types.h \
+               include/cglm-common.h \
+               include/cglm-affine.h \
+               include/cglm-vec.h \
+               include/cglm-euler.h \
+               include/cglm-util.h \
+               include/cglm-quat.h \
+               include/cglm-mat.h \
+               include/cglm-affine-mat.h
+
+cglm_arch_simddir=$(includedir)/cglm/arch/simd/
+cglm_arch_simd_HEADERS = include/arch/simd/cglm-mat-simd-avx.h \
                         include/arch/simd/cglm-affine-mat-avx.h \
                         include/arch/simd/cglm-quat-simd.h \
                         include/arch/simd/cglm-affine-mat-sse2.h \
                         include/arch/simd/cglm-mat3-simd-sse2.h \
                         include/arch/simd/cglm-mat-simd-sse2.h \
-                         include/arch/simd/cglm-intrin.h \
-                         include/call/cglmc-euler.h \
-                         include/call/cglmc-quat.h \
-                         include/call/cglmc-cam.h \
-                         include/call/cglmc-io.h \
-                         include/call/cglmc-affine.h \
-                         include/call/cglmc-vec.h \
-                         include/call/cglmc-mat3.h \
-                         include/call/cglmc-mat.h
+                         include/arch/simd/cglm-intrin.h
+
+cglm_calldir=$(includedir)/cglm/call
+cglm_call_HEADERS = include/call/cglmc-euler.h \
+                    include/call/cglmc-quat.h \
+                    include/call/cglmc-cam.h \
+                    include/call/cglmc-io.h \
+                    include/call/cglmc-affine.h \
+                    include/call/cglmc-vec.h \
+                    include/call/cglmc-mat3.h \
+                    include/call/cglmc-mat.h

 libcglm_la_SOURCES=\
    src/cglm-euler.c \
--- a/win/cglm.vcxproj
+++ b/win/cglm.vcxproj
@@ -192,6 +192,7 @@
    <ClInclude Include="..\include\cglm-util.h" />
    <ClInclude Include="..\include\cglm-vec-ext.h" />
    <ClInclude Include="..\include\cglm-vec.h" />
+    <ClInclude Include="..\include\cglm-version.h" />
    <ClInclude Include="..\include\cglm.h" />
    <ClInclude Include="..\src\config.h" />
  </ItemGroup>
--- a/win/cglm.vcxproj.filters
+++ b/win/cglm.vcxproj.filters
@@ -120,6 +120,9 @@
    <ClInclude Include="..\src\config.h">
      <Filter>src</Filter>
    </ClInclude>
+    <ClInclude Include="..\include\cglm-version.h">
+      <Filter>include</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\cglm-cam.c">
Author	SHA1	Message	Date
Recep Aslantas	e47cc22300	build: fix make install include path * now we can include library headers like this: #include <cglm/cglm.h>	2017-05-21 13:39:38 +03:00
Recep Aslantas	8aa80d3e9b	win: add version header to project	2017-05-21 12:36:31 +03:00
Recep Aslantas	f90d3f5faf	add removed functions as macro as DEPRECATED	2017-05-21 12:28:06 +03:00