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

BUGFIX: Use the correct path for the file assimp.pc.in ( thanks to Roman Kharitonov ). 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@925 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
kimmi 2011-03-31 21:38:18 +00:00
parent 5dd2bc1408
commit 5f10c38baa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -22,8 +22,8 @@ SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH
"Path the tool executables are installed to." )
# Generate a pkg-config .pc for the Assimp library.
CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/assimp.pc.in" "${CMAKE_BINARY_DIR}/assimp.pc" @ONLY )
INSTALL( FILES "${CMAKE_BINARY_DIR}/assimp.pc" DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ )
CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/assimp.pc.in" "${PROJECT_BINARY_DIR}/assimp.pc" @ONLY )
INSTALL( FILES "${PROJECT_BINARY_DIR}/assimp.pc" DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ )
# Globally enbale Boost resp. the Boost workaround – it is also needed by the
# tools which include the Assimp headers.

4
code/Q3BSPFileImporter.cpp
View File

@ -62,10 +62,10 @@ namespace Assimp
using namespace Q3BSP;
static const std::string Q3BSPExtention = "pk3";
static const std::string Q3BSPExtension = "pk3";
// ------------------------------------------------------------------------------------------------
// Local fnction to create a material keyname.
// Local function to create a material key name.
static void createKey( int id1, int id2, std::string &rKey )
{
std::stringstream str;