v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/5/head
aramis_acg 2012-04-22 23:14:39 +00:00
parent d3030b2aea
commit adfef670cc
10 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/ByteSwap.h
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_BYTESWAP_H_INC #ifndef AI_BYTESWAP_H_INC
#define AI_BYTESWAP_H_INC #define AI_BYTESWAP_H_INC
#include "../include/assimp/assert.h" #include "../include/assimp/ai_assert.h"
#include "../include/assimp/types.h" #include "../include/assimp/types.h"
#if _MSC_VER >= 1400 #if _MSC_VER >= 1400

2
code/CMakeLists.txt
View File

@ -19,7 +19,7 @@ SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})
SET( PUBLIC_HEADERS SET( PUBLIC_HEADERS
${HEADER_PATH}/anim.h ${HEADER_PATH}/anim.h
${HEADER_PATH}/assert.h ${HEADER_PATH}/ai_assert.h
${HEADER_PATH}/camera.h ${HEADER_PATH}/camera.h
${HEADER_PATH}/color4.h ${HEADER_PATH}/color4.h
${HEADER_PATH}/color4.inl ${HEADER_PATH}/color4.inl

2
code/ColladaExporter.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_COLLADAEXPORTER_H_INC #ifndef AI_COLLADAEXPORTER_H_INC
#define AI_COLLADAEXPORTER_H_INC #define AI_COLLADAEXPORTER_H_INC
#include "../include/assimp/assert.h" #include "../include/assimp/ai_assert.h"
#include <sstream> #include <sstream>
struct aiScene; struct aiScene;

2
code/RemoveComments.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_REMOVE_COMMENTS_H_INC #ifndef AI_REMOVE_COMMENTS_H_INC
#define AI_REMOVE_COMMENTS_H_INC #define AI_REMOVE_COMMENTS_H_INC
#include "../include/assimp/assert.h" #include "../include/assimp/ai_assert.h"
namespace Assimp { namespace Assimp {

2
code/SceneCombiner.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_SCENE_COMBINER_H_INC #ifndef AI_SCENE_COMBINER_H_INC
#define AI_SCENE_COMBINER_H_INC #define AI_SCENE_COMBINER_H_INC
#include "../include/assimp/assert.h" #include "../include/assimp/ai_assert.h"
namespace Assimp { namespace Assimp {

2
code/StringComparison.h
View File

@ -50,6 +50,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef INCLUDED_AI_STRING_WORKERS_H #ifndef INCLUDED_AI_STRING_WORKERS_H
#define INCLUDED_AI_STRING_WORKERS_H #define INCLUDED_AI_STRING_WORKERS_H
#include "../include/assimp/ai_assert.h"
namespace Assimp { namespace Assimp {
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------

2
code/VertexTriangleAdjacency.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "BaseProcess.h" #include "BaseProcess.h"
#include "../include/assimp/types.h" #include "../include/assimp/types.h"
#include "../include/assimp/assert.h" #include "../include/assimp/ai_assert.h"
struct aiMesh; struct aiMesh;
namespace Assimp { namespace Assimp {

0
include/assimp/assert.h → include/assimp/ai_assert.h
View File

2
tools/assimp_view/assimp_view.h
View File

@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Include ASSIMP headers (XXX: do we really need all of them?) // Include ASSIMP headers (XXX: do we really need all of them?)
#include <assimp/cimport.h> #include <assimp/cimport.h>
#include <assimp/Importer.hpp> #include <assimp/Importer.hpp>
#include <assimp/assert.h> #include <assimp/ai_assert.h>
#include <assimp/cfileio.h> #include <assimp/cfileio.h>
#include <assimp/postprocess.h> #include <assimp/postprocess.h>
#include <assimp/scene.h> #include <assimp/scene.h>

4
workspaces/vc9/assimp.vcproj
View File

@ -1173,11 +1173,11 @@
Name="Common" Name="Common"
> >
<File <File
RelativePath="..\..\include\assimp\anim.h" RelativePath="..\..\include\assimp\ai_assert.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\assimp\assert.h" RelativePath="..\..\include\assimp\anim.h"
> >
</File> </File>
<File <File