Compile fixes for MinGW, checked with basic initial setup, no CUDA, gcc 4.5.2.
OpenImageIO still gives link-time errors, will try to make a lib for MinGW, see if it is fixed.
This commit is contained in:
@@ -975,6 +975,28 @@ elseif(WIN32)
|
|||||||
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
|
set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(WITH_BOOST)
|
||||||
|
set(BOOST ${LIBDIR}/boost)
|
||||||
|
set(BOOST_INCLUDE_DIR ${BOOST}/include)
|
||||||
|
set(BOOST_POSTFIX "vc90-mt-s-1_46_1")
|
||||||
|
set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_46_1")
|
||||||
|
set(BOOST_LIBRARIES
|
||||||
|
optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
|
||||||
|
libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
|
||||||
|
debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
|
||||||
|
libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
|
||||||
|
set(BOOST_LIBPATH ${BOOST}/lib)
|
||||||
|
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(WITH_OPENIMAGEIO)
|
||||||
|
set(OPENIMAGEIO ${LIBDIR}/openimageio)
|
||||||
|
set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO}/include)
|
||||||
|
set(OPENIMAGEIO_LIBRARY OpenImageIO)
|
||||||
|
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
|
||||||
|
set(OPENIMAGEIO_DEFINITIONS)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(PLATFORM_LINKFLAGS "--stack,2097152")
|
set(PLATFORM_LINKFLAGS "--stack,2097152")
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
@@ -16,8 +16,13 @@ if(APPLE)
|
|||||||
endif(APPLE)
|
endif(APPLE)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
if(MSVC)
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
|
||||||
set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
|
set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
|
||||||
|
elseif(CMAKE_COMPILER_IS_GNUCC)
|
||||||
|
set(CMAKE_CXX_FLAGS "${GCC_WARNING_FLAGS} ${GCC_OPTIM_FLAGS}")
|
||||||
|
set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
|
||||||
|
endif()
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
|
@@ -60,8 +60,10 @@ CCL_NAMESPACE_BEGIN
|
|||||||
|
|
||||||
#ifndef __KERNEL_GPU__
|
#ifndef __KERNEL_GPU__
|
||||||
|
|
||||||
|
#if(!defined(FREE_WINDOWS))
|
||||||
#define copysignf(x, y) ((float)_copysign(x, y))
|
#define copysignf(x, y) ((float)_copysign(x, y))
|
||||||
#define hypotf(x, y) _hypotf(x, y)
|
#define hypotf(x, y) _hypotf(x, y)
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -20,7 +20,9 @@
|
|||||||
#include "util_types.h"
|
#include "util_types.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
#if(!defined(FREE_WINDOWS))
|
||||||
#include <intrin.h>
|
#include <intrin.h>
|
||||||
|
#endif
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
#include <sys/sysctl.h>
|
#include <sys/sysctl.h>
|
||||||
@@ -57,7 +59,7 @@ int system_cpu_thread_count()
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef _WIN32
|
#if !defined(_WIN32) || defined(FREE_WINDOWS)
|
||||||
static void __cpuid(int data[4], int selector)
|
static void __cpuid(int data[4], int selector)
|
||||||
{
|
{
|
||||||
#ifdef __x86_64__
|
#ifdef __x86_64__
|
||||||
|
Reference in New Issue
Block a user