[artoolkit-commits] SF.net SVN: artoolkit:[289] branches/hartmut-pre-2_8/artoolkit
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
[artoolkit-commits] SF.net SVN: artoolkit:[289] branches/hartmut-pre-2_8/artoolkit
|
From: <ret...@us...> - 2008-08-20 04:18:41
|
Revision: 289
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=289&view=rev
Author: retrakker
Date: 2008-08-20 04:18:49 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
- added a more elaborate search mode for Windows SDK or internal Platform SDK
- updated DSVL to honour the problem with qedit.h and the missing dxtrans.h
- Note: qedit.h needs still to be fixed for both Windows 2003 Server SDK and Server 2008 SDK
Unlike suggestion in [1] the newest DirectX SDK are missing this header.
Following the suggestions by a Microsoft employee [1] this might be changed in the Windows 7 SDK
1) http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=2617687&SiteID=1
- added internal freeglut copy to support ia64 support on Windows
Modified Paths:
--------------
branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindDirectShow.cmake
branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.h
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_Helpers.cpp
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_Helpers.h
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_PixelFormat.cpp
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/IEEE1394_id.cpp
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-20 03:55:26 UTC (rev 288)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-20 04:18:49 UTC (rev 289)
@@ -19,6 +19,16 @@
set(ARTOOLKIT_VERSION_TINY 3)
set(ARTOOLKIT_VERSION_REV 99)
+#
+# Depending on what is available we work our way through
+#
+find_package(OpenGL)
+find_package(GLUT)
+
+
+#
+# Preset some of the output directories
+#
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Executable output folder")
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Library output folder")
@@ -27,14 +37,17 @@
#
if(MSVC)
- set(GLUT_ROOT_PATH "${CMAKE_SOURCE_DIR}/lib/SRC/_ext/glut-3.7.6-bin" CACHE PATH "GLUT root folder")
- set(GLUT_glut_LIBRARY "${CMAKE_SOURCE_DIR}/lib/SRC/_ext/glut-3.7.6-bin/lib/glut32.lib" CACHE FILENAME "GLUT include library")
+ set(FREEGLUT_ROOT_DIR "lib/SRC/_ext/freeglut")
+
+ # compile internal GLUT copy
+ add_subdirectory(${FREEGLUT_ROOT_DIR}/src)
+
+ #
+ # Add our internal copy of FreeGLUT
+ #
+ set(GLUT_ROOT_PATH "${CMAKE_SOURCE_DIR}/${FREEGLUT_ROOT_DIR}" CACHE PATH "GLUT root folder")
+ set(GLUT_LIBRARIES glut)
- install(FILES
- ${CMAKE_SOURCE_DIR}/lib/SRC/_ext/glut-3.7.6-bin/lib/glut32.dll
- DESTINATION bin
- )
-
endif(MSVC)
if(WIN32)
@@ -50,14 +63,7 @@
README.txt
DESTINATION share/artoolkit_2
)
-
-#
-# Depending on what is available we work our way through
-#
-find_package(OpenGL)
-find_package(GLUT)
-
if (APPLE)
set(CMAKE_OSX_ARCHITECTURES ppc;i386)
set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindDirectShow.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindDirectShow.cmake 2008-08-20 03:55:26 UTC (rev 288)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindDirectShow.cmake 2008-08-20 04:18:49 UTC (rev 289)
@@ -8,12 +8,28 @@
# DirectShow is only available on Windows platforms
IF(MSVC)
+
+ set(MS_PLATFORMSDK_ROOT "")
+ if (MSVC71)
+ #
+ # On Visual Studio 2003 .NET (VS7.1) use the internal platform SDK
+ #
+ set(MS_PLATFORMSDK_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.1\\Setup\\VC;ProductDir]/PlatformSDK")
+ else(MSVC71)
+ #
+ # Otherwise use the Windows SDK - remember you need to patch the qedit.h header!
+ #
+ set(MS_PLATFORMSDK_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]")
+ #
+ # emit a message
+ #
+ message(STATUS "Remember to patch (remove dxtrans.h) the qedit.h header in the Windows SDK (${MS_PLATFORMSDK_ROOT})")
+ endif(MSVC71)
+
# Find DirectX Include Directory (dshow depends on it)
FIND_PATH(DIRECTX_INCLUDE_DIR ddraw.h
- # WindowsSDK: includes ddraw and dshow
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]/Include"
- # VS 7.1 PlatformSDK: includes ddraw and dshow
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\7.1\\Setup\\VC;ProductDir]/PlatformSDK/Include"
+ # Visual Studio product based PlatformSDK/Windows SDK
+ ${MS_PLATFORMSDK_ROOT}/Include
# Newer DirectX: dshow not included; requires Platform SDK
"$ENV{DXSDK_DIR}/Include"
# Older DirectX: dshow included
@@ -26,8 +42,8 @@
IF(DIRECTX_INCLUDE_DIR)
FIND_PATH(DIRECTSHOW_INCLUDE_DIR dshow.h
"${DIRECTX_INCLUDE_DIR}"
- "C:/Program Files/Microsoft Platform SDK for Windows Server 2003 R2/Include"
- "C:/Program Files/Microsoft Platform SDK/Include"
+ "$ENV{ProgramFiles}/Microsoft Platform SDK for Windows Server 2003 R2/Include"
+ "$ENV{ProgramFiles}/Microsoft Platform SDK/Include"
DOC "What is the path where the file dshow.h can be found"
NO_DEFAULT_PATH
)
@@ -80,8 +96,20 @@
SET(CMAKE_REQUIRED_INCLUDES ${DIRECTSHOW_INCLUDE_DIRS})
SET(CMAKE_REQUIRED_LIBRARIES ${DIRECTSHOW_LIBRARIES})
CHECK_CXX_SOURCE_COMPILES("
+
+
#include <atlbase.h>
#include <dshow.h>
+
+ // dxtrans.h is missing in latest SDKs
+ // please comment out dxtrans.h in qedit h
+ // and use the following block before including qedit.h in
+ // your own source code
+ #define __IDxtCompositor_INTERFACE_DEFINED__
+ #define __IDxtAlphaSetter_INTERFACE_DEFINED__
+ #define __IDxtJpeg_INTERFACE_DEFINED__
+ #define __IDxtKey_INTERFACE_DEFINED__
+
#include <qedit.h>
int main()
Modified: branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt 2008-08-20 03:55:26 UTC (rev 288)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simpleLite/CMakeLists.txt 2008-08-20 04:18:49 UTC (rev 289)
@@ -6,6 +6,8 @@
artoolkit_executable(${EXE_NAME} ${SRCS})
+message(STATUS "GLUT ${GLUT_LIBRARIES}")
+
target_link_libraries(${EXE_NAME} AR ARgsub_lite ARvideo ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
artoolkit_exe_install(${EXE_NAME})
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-20 03:55:26 UTC (rev 288)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-20 04:18:49 UTC (rev 289)
@@ -1,3 +1,10 @@
+##############################################################################
+# CMake build system for ARToolKit 2.7.x #
+# #
+# (c) Copyright 2007-2008, HITLabNZ, Hartmut Seichter #
+##############################################################################
+
+
# Core library
add_subdirectory(AR)
add_subdirectory(ARMulti)
@@ -6,16 +13,16 @@
add_subdirectory(Gl)
# Video
-IF (APPLE)
- ADD_SUBDIRECTORY(VideoMacOSX)
-ENDIF(APPLE)
+if(APPLE)
+ add_subdirectory(VideoMacOSX)
+endif(APPLE)
if(WIN32)
add_subdirectory(VideoWin32DirectShow)
endif(WIN32)
-IF (UNIX)
- IF (USE_GSTREAMER)
- ADD_SUBDIRECTORY(VideoGStreamer)
- ENDIF(USE_GSTREAMER)
-ENDIF(UNIX)
+if(UNIX)
+ if(USE_GSTREAMER)
+ add_subdirectory(VideoGStreamer)
+ endif(USE_GSTREAMER)
+endif(UNIX)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.h
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.h 2008-08-20 03:55:26 UTC (rev 288)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_GraphManager.h 2008-08-20 04:18:49 UTC (rev 289)
@@ -30,6 +30,10 @@
#include <atlbase.h>
#include <dshow.h>
+#define __IDxtCompositor_INTERFACE_DEFINED__
+#define __IDxtAlphaSetter_INTERFACE_DEFINED__
+#define __IDxtJpeg_INTERFACE_DEFINED__
+#define __IDxtKey_INTERFACE_DEFINED__
#include <qedit.h>
#include <stllock.h> // CCritSec - Platform SDK
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_Helpers.cpp
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_Helpers.cpp 2008-08-20 03:55:26 UTC (rev 288)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_Helpers.cpp 2008-08-20 04:18:49 UTC (rev 289)
@@ -28,13 +28,10 @@
* Vienna, Austria.
* ========================================================================*/
-#include <atlbase.h>
-#include <dshow.h>
-#include <qedit.h>
-#include <comutil.h>
#include "DSVL_Helpers.h"
+
#include <cstring>
#include <cstdlib>
#include <cstdio>
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_Helpers.h
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_Helpers.h 2008-08-20 03:55:26 UTC (rev 288)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_Helpers.h 2008-08-20 04:18:49 UTC (rev 289)
@@ -34,9 +34,16 @@
#include <atlbase.h>
#include <dshow.h>
+
+#define __IDxtCompositor_INTERFACE_DEFINED__
+#define __IDxtAlphaSetter_INTERFACE_DEFINED__
+#define __IDxtJpeg_INTERFACE_DEFINED__
+#define __IDxtKey_INTERFACE_DEFINED__
+
#include <qedit.h>
#include <stllock.h> // CCritSec - Platform SDK
#include <assert.h>
+#include <comutil.h>
#define ASSERT(x) assert(x);
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_PixelFormat.cpp
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_PixelFormat.cpp 2008-08-20 03:55:26 UTC (rev 288)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/DSVL_PixelFormat.cpp 2008-08-20 04:18:49 UTC (rev 289)
@@ -32,6 +32,12 @@
#include <atlbase.h>
#include <dshow.h>
+
+#define __IDxtCompositor_INTERFACE_DEFINED__
+#define __IDxtAlphaSetter_INTERFACE_DEFINED__
+#define __IDxtJpeg_INTERFACE_DEFINED__
+#define __IDxtKey_INTERFACE_DEFINED__
+
#include <qedit.h>
#include <GL\gl.h>
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/IEEE1394_id.cpp
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/IEEE1394_id.cpp 2008-08-20 03:55:26 UTC (rev 288)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/IEEE1394_id.cpp 2008-08-20 04:18:49 UTC (rev 289)
@@ -33,6 +33,12 @@
//#include <streams.h>
#include <atlbase.h>
#include <dshow.h>
+
+#define __IDxtCompositor_INTERFACE_DEFINED__
+#define __IDxtAlphaSetter_INTERFACE_DEFINED__
+#define __IDxtJpeg_INTERFACE_DEFINED__
+#define __IDxtKey_INTERFACE_DEFINED__
+
#include <qedit.h>
#include <atlbase.h>
#include <comutil.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
