Page MenuHomePhabricator
Files F535

bug4013.diff
Public
Actions

Authored By
xplanes
May 14 2010, 12:53 PM
Size
1 KB
Referenced Files
None
Subscribers
None

bug4013.diff
View Options

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 21081)
+++ CMakeLists.txt (working copy)
@@ -58,6 +58,12 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=0x0500")
ENDIF()
+IF(CMAKE_CROSSCOMPILING)
+ IF(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CMAKE_CROSSCOMPILING")
+ ENDIF()
+ENDIF()
+
ADD_SUBDIRECTORY(Utilities)
OPTION(MITK_USE_BLUEBERRY "Build the BlueBerry platform" ON)
Index: Modules/MitkExt/Controllers/mitkMovieGenerator.cpp
===================================================================
--- Modules/MitkExt/Controllers/mitkMovieGenerator.cpp (revision 21081)
+++ Modules/MitkExt/Controllers/mitkMovieGenerator.cpp (working copy)
@@ -23,9 +23,11 @@
#if WIN32
#ifndef __GNUC__
+#ifndef _CMAKE_CROSSCOMPILING
//#if ! (_MSC_VER >= 1400)
#include "mitkMovieGeneratorWin32.h"
//#endif
+#endif
#else
#include "GL/glext.h"
#endif
@@ -56,8 +58,10 @@
#ifdef WIN32
#ifndef __GNUC__
//#if ! (_MSC_VER >= 1400)
+#ifndef _CMAKE_CROSSCOMPILING
mitk::MovieGenerator::Pointer wp = static_cast<mitk::MovieGenerator*>(mitk::MovieGeneratorWin32::New());
return wp;
+#endif
//#endif
#endif
#endif

File Metadata

Mime Type
text/plain
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
513
Default Alt Text
bug4013.diff (1 KB)
MITK · MIC · IMSY · DKFZ