Merge pull request #99 from DavidBluecame/mac_os_2

Patches to allow building for Mac OSX
YafaRay · Nov 8, 2015 · ee254c6 · ee254c6
2 parents 150dea7 + 26daa53
commit ee254c6
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 36 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,6 +23,8 @@ option(FAST_TRIG "Enable trigonometric approximations to make code faster" ON)
 
 ###### Packages and Definitions #########
 
+SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk")
+
 # Load user configurations if available
 include(CMakeConfig/UserConfig.txt OPTIONAL)
 

diff --git a/CMakeModules/FindYafPythonLibs.cmake b/CMakeModules/FindYafPythonLibs.cmake
@@ -108,21 +108,23 @@ ENDIF(Python_FRAMEWORKS)
 # library. We now set the variables listed by the documentation for this
 # module.
 if(WITH_OSX_ADDON)
-	# for Blender2.5 OSX we need to link to the BF_python libs build by blender ! added a switch for a choice "blender-/general use" - Jens
-	if (NOT YAF_OSX_PYTHON_INCLUDE_DIR)
-		SET(PYTHON_INCLUDE_DIRS ${YAF_USER_INCLUDE_DIRS}/python3.2)
-	else (NOT YAF_OSX_PYTHON_LIB)
-		SET(PYTHON_INCLUDE_DIR ${YAF_OSX_PYTHON_INCLUDE_DIR})
-	endif (NOT YAF_OSX_PYTHON_INCLUDE_DIR)
-	if (NOT YAF_OSX_PYTHON_LIB)
-		SET(PYTHON_LIBRARIES ${YAF_USER_LIBRARY_DIRS}/BF_pythonlibs/libbf_python_ext.a ${YAF_USER_LIBRARY_DIRS}/BF_pythonlibs/libbf_python.a)
-	else (NOT YAF_OSX_PYTHON_LIB)
-		SET(PYTHON_LIBRARIES ${YAF_OSX_PYTHON_LIB})
-	endif (NOT YAF_OSX_PYTHON_LIB)
+# for Blender2.5 OSX we need to link to the BF_python libs build by blender ! added a switch for a choice "blender-/general use" - Jens
+SET(PYTHON_INCLUDE_DIR ${YAF_USER_INCLUDE_DIRS}/Python${YAF_PY_VERSION} CACHE PATH "" FORCE)
+SET(PYTHON_LIBRARIES ${YAF_USER_LIBRARY_DIRS}/BF_pythonlibs/libbf_python_ext.a ${YAF_USER_LIBRARY_DIRS}/BF_pythonlibs/libbf_python.a)
+#	if (NOT YAF_OSX_PYTHON_INCLUDE_DIR)
+#		SET(PYTHON_INCLUDE_DIRS ${YAF_USER_INCLUDE_DIRS}/python3.2)
+#	else (NOT YAF_OSX_PYTHON_LIB)
+#		SET(PYTHON_INCLUDE_DIR ${YAF_OSX_PYTHON_INCLUDE_DIR})
+#	endif (NOT YAF_OSX_PYTHON_INCLUDE_DIR)
+#	if (NOT YAF_OSX_PYTHON_LIB)
+#		SET(PYTHON_LIBRARIES ${YAF_USER_LIBRARY_DIRS}/BF_pythonlibs/libbf_python_ext.a ${YAF_USER_LIBRARY_DIRS}/BF_pythonlibs/libbf_python.a)
+#	else (NOT YAF_OSX_PYTHON_LIB)
+#		SET(PYTHON_LIBRARIES ${YAF_OSX_PYTHON_LIB})
+#	endif (NOT YAF_OSX_PYTHON_LIB)
 else(WITH_OSX_ADDON)
-	SET(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
-	SET(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
-	SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
+SET(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+SET(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
+SET(PYTHON_DEBUG_LIBRARIES "${PYTHON_DEBUG_LIBRARY}")
 endif(WITH_OSX_ADDON)
 
 

diff --git a/include/core_api/integrator.h b/include/core_api/integrator.h
@@ -35,7 +35,7 @@ __BEGIN_YAFRAY
 */
 
 class imageFilm_t;
-class renderArea_t;
+struct renderArea_t;
 
 class YAFRAYCORE_EXPORT integrator_t
 {

diff --git a/include/core_api/light.h b/include/core_api/light.h
@@ -7,7 +7,7 @@
 
 __BEGIN_YAFRAY
 
-class surfacePoint_t;
+struct surfacePoint_t;
 class background_t;
 
 enum { LIGHT_NONE = 0, LIGHT_DIRACDIR = 1, LIGHT_SINGULAR = 1<<1 }; // "LIGHT_DIRACDIR" *must* be same as "BSDF_SPECULAR" (material.h)!

diff --git a/include/core_api/material.h b/include/core_api/material.h
@@ -25,8 +25,8 @@ class YAFRAYCORE_EXPORT BSDF_t
 };
 */
 
-class surfacePoint_t;
-class renderState_t;
+struct surfacePoint_t;
+struct renderState_t;
 class volumeHandler_t;
 
 enum bsdfFlags_t

diff --git a/include/core_api/object3d.h b/include/core_api/object3d.h
@@ -14,7 +14,7 @@ __BEGIN_YAFRAY
 
 class light_t;
 class primitive_t;
-class surfacePoint_t;
+struct surfacePoint_t;
 
 class YAFRAYCORE_EXPORT object3d_t
 {

diff --git a/include/core_api/scene.h b/include/core_api/scene.h
@@ -32,7 +32,7 @@ class material_t;
 class object3d_t;
 class triangleObject_t;
 class meshObject_t;
-class surfacePoint_t;
+struct surfacePoint_t;
 class ray_t;
 class primitive_t;
 class triKdTree_t;
@@ -43,7 +43,7 @@ class light_t;
 class surfaceIntegrator_t;
 class volumeIntegrator_t;
 class imageFilm_t;
-class renderArea_t;
+struct renderArea_t;
 class random_t;
 
 typedef unsigned int objID_t;

diff --git a/include/core_api/volume.h b/include/core_api/volume.h
@@ -9,8 +9,8 @@
 
 __BEGIN_YAFRAY
 
-class renderState_t;
-class pSample_t;
+struct renderState_t;
+struct pSample_t;
 class light_t;
 
 

diff --git a/include/utilities/mathOptimizations.h b/include/utilities/mathOptimizations.h
@@ -120,6 +120,14 @@ inline float asmSqrt(float n)
 		fsqrt
 		fstp r
     }
+#elif defined (__APPLE__)
+	asm(
+		"flds %0;"
+		"fsqrt;"
+		"fstps %0"
+		:"=m" (r)
+		:"m" (r)
+		);
 #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
     asm(
 		"fld %0;"

diff --git a/include/yafraycore/kdtree.h b/include/yafraycore/kdtree.h
@@ -14,7 +14,7 @@ __BEGIN_YAFRAY
 
 extern int Kd_inodes, Kd_leaves, _emptyKd_leaves, Kd_prims;
 
-class renderState_t;
+struct renderState_t;
 
 #define PRIM_DAT_SIZE 32
 

diff --git a/include/yafraycore/ray_kdtree.h b/include/yafraycore/ray_kdtree.h
@@ -15,7 +15,7 @@ __BEGIN_YAFRAY
 
 extern int Kd_inodes, Kd_leaves, _emptyKd_leaves, Kd_prims, _clip, _bad_clip, _null_clip, _early_out;
 
-class renderState_t;
+struct renderState_t;
 
 #define PRIM_DAT_SIZE 32
 

diff --git a/src/image_handlers/CMakeLists.txt b/src/image_handlers/CMakeLists.txt
@@ -35,7 +35,7 @@ endif(WITH_PNG)
 
 if(WITH_TIFF)
 add_library(tifHandler SHARED tifHandler.cc)
-target_link_libraries(tifHandler yafaraycore ${TIFF_LIBRARY})
+target_link_libraries(tifHandler yafaraycore -Wl,-undefined -Wl,dynamic_lookup ${TIFF_LIBRARY})
 endif(WITH_TIFF)
 
 add_library(tgaHandler SHARED tgaHandler.cc)

diff --git a/src/volumes/ExpDensityVolume.cc b/src/volumes/ExpDensityVolume.cc
@@ -8,8 +8,8 @@
 
 __BEGIN_YAFRAY
 
-class renderState_t;
-class pSample_t;
+struct renderState_t;
+struct pSample_t;
 
 class ExpDensityVolume : public DensityVolume {
 	public:

diff --git a/src/volumes/GridVolume.cc b/src/volumes/GridVolume.cc
@@ -14,8 +14,8 @@
 
 __BEGIN_YAFRAY
 
-class renderState_t;
-class pSample_t;
+struct renderState_t;
+struct pSample_t;
 
 class GridVolume : public DensityVolume {
 	public:

diff --git a/src/volumes/NoiseVolume.cc b/src/volumes/NoiseVolume.cc
@@ -14,8 +14,8 @@
 
 __BEGIN_YAFRAY
 
-class renderState_t;
-class pSample_t;
+struct renderState_t;
+struct pSample_t;
 
 class NoiseVolume : public DensityVolume {
 	public:

diff --git a/src/volumes/SkyVolume.cc b/src/volumes/SkyVolume.cc
@@ -11,8 +11,8 @@
 
 __BEGIN_YAFRAY
 
-class renderState_t;
-class pSample_t;
+struct renderState_t;
+struct pSample_t;
 
 class SkyVolume : public VolumeRegion {
 	public:

diff --git a/src/volumes/UniformVolume.cc b/src/volumes/UniformVolume.cc
@@ -8,8 +8,8 @@
 
 __BEGIN_YAFRAY
 
-class renderState_t;
-class pSample_t;
+struct renderState_t;
+struct pSample_t;
 
 class UniformVolume : public VolumeRegion {
 	public:

diff --git a/src/yafraycore/mcintegrator.cc b/src/yafraycore/mcintegrator.cc
@@ -28,6 +28,10 @@
 #include <yafraycore/spectrum.h>
 #include <utilities/mcqmc.h>
 
+#ifdef __clang__
+#define inline  // aka inline removal
+#endif
+
 __BEGIN_YAFRAY
 
 #define allBSDFIntersect (BSDF_GLOSSY | BSDF_DIFFUSE | BSDF_DISPERSIVE | BSDF_REFLECT | BSDF_TRANSMIT);

diff --git a/src/yafraycore/triangle.cc b/src/yafraycore/triangle.cc
@@ -1,6 +1,10 @@
 #include <cassert>
 #include <yafraycore/meshtypes.h>
 
+#ifdef __clang__
+#define inline  // aka inline removal
+#endif
+
 __BEGIN_YAFRAY
 
 int triBoxClip(const double b_min[3], const double b_max[3], const double triverts[3][3], bound_t &box, void* n_dat);