lib3ds: fix soname, use safe source.

* enable x86_64.
This commit is contained in:
Jerome Duval
2017-04-12 20:59:11 +02:00
parent b77d6e1f39
commit f1c213253d
2 changed files with 61 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
From cb0a0e266f99aab2da7b4ca1897adc28cf94e1af Mon Sep 17 00:00:00 2001
From 49cbf369797ebc3fc09cfe2e885283d6a9ae0636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
<adrian.arroyocalle@gmail.com>
Date: Fri, 11 Sep 2015 12:18:29 +0000
@@ -15,5 +15,49 @@ index 37cafd7..133252e 100644
ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(examples)
--
2.2.2
2.11.0
From 81ea9416307264b04d611a83e27570d3dd54a38e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 12 Apr 2017 19:01:56 +0200
Subject: SONAME should be lib3ds instead of liblib3ds.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 133252e..cf7d16e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
-PROJECT(lib3ds)
+PROJECT(3ds)
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b8f73db..a3118b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ IF(MSVC)
ADD_DEFINITIONS(-DLIB3DS_EXPORTS)
ENDIF(MSVC)
-ADD_LIBRARY(lib3ds SHARED
+ADD_LIBRARY(3ds SHARED
lib3ds.h
lib3ds_impl.h
lib3ds_atmosphere.c
@@ -32,6 +32,6 @@ IF(WIN32)
DEBUG_POSTFIX "d")
ENDIF(WIN32)
-SET_TARGET_PROPERTIES(lib3ds
+SET_TARGET_PROPERTIES(3ds
PROPERTIES VERSION 2.0)
-
\ No newline at end of file
+
--
2.11.0