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

UPDATE: Add opengl-samples to cmake build enviroment for windows systems. 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@823 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
kimmi 2010-10-03 12:08:21 +00:00
parent 733fd48f9e
commit 0fd0f68b26
5 changed files with 67 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -51,13 +51,14 @@ ENDIF ( ENABLE_BOOST_WORKAROUND )
ADD_SUBDIRECTORY( code/ )
SET ( BUILD_ASSIMP_TOOLS ON CACHE BOOL
"If the supplementary tools for Assimp are built in addition to the library."
)
IF ( BUILD_ASSIMP_TOOLS )
IF ( WIN32 )
ADD_SUBDIRECTORY( tools/assimp_view/ )
ADD_SUBDIRECTORY( samples/SimpleOpenGL/ )
ADD_SUBDIRECTORY( samples/SimpleTexturedOpenGL/ )
ENDIF ( WIN32 )
ADD_SUBDIRECTORY( tools/assimp_cmd/ )
ENDIF ( BUILD_ASSIMP_TOOLS )

24
samples/SimpleOpenGL/CMakeLists.txt 100644
View File

@ -0,0 +1,24 @@
INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/include
${Assimp_SOURCE_DIR}/code
${Assimp_SOURCE_DIR}/samples/glut/
)
LINK_DIRECTORIES(
${Assimp_BINARY_DIR}
${Assimp_BINARY_DIR}/lib
${Assimp_SOURCE_DIR}/samples/glut/
)
ADD_EXECUTABLE( assimp_simpleogl
Sample_SimpleOpenGL.c
)
TARGET_LINK_LIBRARIES( assimp_simpleogl assimp )
SET_TARGET_PROPERTIES( assimp_simpleogl PROPERTIES
OUTPUT_NAME assimp_simpleogl
)
INSTALL( TARGETS assimp_simpleogl
DESTINATION "${BIN_INSTALL_DIR}"
)

40
samples/SimpleTexturedOpenGL/CMakeLists.txt 100644
View File

@ -0,0 +1,40 @@
INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/include
${Assimp_SOURCE_DIR}/code
${Assimp_SOURCE_DIR}/samples/glut/
${Assimp_SOURCE_DIR}/samples/DevIL/include/
)
LINK_DIRECTORIES(
${Assimp_BINARY_DIR}
${Assimp_BINARY_DIR}/lib/
${Assimp_SOURCE_DIR}/samples/glut/
${Assimp_SOURCE_DIR}/samples/DevIL/lib/
)
ADD_EXECUTABLE( assimp_simpletexturedogl WIN32
SimpleTexturedOpenGL/include/boost_includes.h
SimpleTexturedOpenGL/src/model_loading.cpp
)
IF( WIN32 )
SET( PSDK_PATH "C:/Program Files/Microsoft Platform SDK/Bin" )
SET( PSDK_INC "C:/Program Files/Microsoft Platform SDK/Include" )
FIND_LIBRARY( WIN32_COMCTRL comctl32.lib
PATHS
"C:/Programme/Microsoft Platform SDK for Windows Server 2003 R2/Lib"
DOC "Path to psdk"
)
ENDIF( WIN32 )
TARGET_LINK_LIBRARIES( assimp_simpletexturedogl assimp opengl32.lib glu32.lib comctl32.lib devil.lib )
SET_TARGET_PROPERTIES( assimp_simpletexturedogl PROPERTIES
OUTPUT_NAME assimp_simpletexturedogl
)
INSTALL( TARGETS assimp_simpletexturedogl
DESTINATION "${BIN_INSTALL_DIR}"
)

6
samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
View File

@ -798,7 +798,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, // Handles for this Window
}
int WINAPI WinMain( __in HINSTANCE hInstance, // Instance
__in_opt HINSTANCE hPrevInstance, // Previous Instance
__in_opt LPSTR lpCmdLine, // Command Line Parameters
@ -895,8 +894,3 @@ int WINAPI WinMain( __in HINSTANCE hInstance, // Instance
KillGLWindow();
return (msg.wParam); // Exit The Program
}

8
tools/assimp_view/assimp_view.cpp
View File

@ -1182,10 +1182,4 @@ aiVector3D GetCameraMatrix (aiMatrix4x4& p_mOut)
return g_sCamera.vPos;
}
};
}