Ticket #1322: kfreebsd_collada.diff

File kfreebsd_collada.diff, 53.2 KB (added by leper, 12 years ago)

  • build/premake/extern_libs4.lua

     
    361361                add_default_include_paths("libpng")
    362362            end
    363363            if os.getversion().description == "OpenBSD" then
    364                 includedirs { "/usr/local/include/libpng" }
     364                pkgconfig_cflags("libpng")
    365365            end
    366366        end,
    367367        link_settings = function()
    … …  
    549549            -- TODO: We need to force linking with these as currently
    550550            -- they need to be loaded explicitly on execution
    551551            if os.getversion().description == "OpenBSD" then
    552                 add_default_links({
    553                     unix_names = { "ogg",
    554                         "vorbis" },
    555                 })
     552                pkgconfig_libs("vorbisfile")
    556553            end
    557554            add_default_links({
    558555                win_names  = { "vorbisfile" },

  • build/premake/premake4.lua

     
    999999        -- required to use WinMain() on Windows, otherwise will default to main()
    10001000        flags { "WinMain" }
    10011001
    1002     elseif os.is("linux") then
    1003         defines { "LINUX" }
    1004 
     1002    elseif os.is("linux") or os.getversion().description == "GNU/kFreeBSD" then
    10051003        links {
    10061004            "dl",
    10071005        }
    … …  
    10241022        linkoptions { "-rdynamic" }
    10251023
    10261024    elseif os.is("macosx") then
    1027         -- define MACOS-something?
    1028 
    10291025        -- install_name settings aren't really supported yet by premake, but there are plans for the future.
    10301026        -- we currently use this hack to work around some bugs with wrong install_names.
    10311027        if target_type == "SharedLib" then

  • libraries/fcollada/include/FMath/FMArrayPointer.h

     
    1515#ifndef _FM_ARRAY_POINTER_H_
    1616#define _FM_ARRAY_POINTER_H_
    1717
    18 #ifndef _FM_ARRAY_H_
    1918#include "FMath/FMArray.h"
    20 #endif // _FM_ARRAY_H_
    2119
    2220// Already documented in FMArray.h.
    2321namespace fm

  • libraries/fcollada/include/FMath/FMTree.h

     
    1414#ifndef _FM_TREE_H_
    1515#define _FM_TREE_H_
    1616
    17 #ifndef _FM_ALLOCATOR_H_
    1817#include "FMath/FMAllocator.h"
    19 #endif // _FM_ALLOCATOR_H_
    2018
    2119namespace fm
    2220{

  • libraries/fcollada/include/FMath/FMFloat.h

     
    1414#ifndef _FM_FLOAT_H_
    1515#define _FM_FLOAT_H_
    1616
    17 #if !defined(_INC_FLOAT) && (defined (WIN32) || defined (LINUX) || defined(__APPLE__))
     17#if !defined(_INC_FLOAT) && (defined (WIN32) || defined (__linux__) || defined(__APPLE__))
    1818#include <float.h>
    1919#endif // _INC_FLOAT, WIN32 and LINUX
    2020

  • libraries/fcollada/include/FMath/FMArray.h

     
    1414#ifndef _FM_ARRAY_H_
    1515#define _FM_ARRAY_H_
    1616
    17 #ifndef _FM_ALLOCATOR_H_
    1817#include "FMath/FMAllocator.h"
    19 #endif // _FM_ALLOCATOR_H_
    20 #ifndef _FM_SORT_H_
    2118#include "FMath/FMSort.h"
    22 #endif // _FM_SORT_H_
    2319
    2420#ifdef WIN32
    2521#pragma warning(disable:4127)

  • libraries/fcollada/include/FUtils/Platforms.h

     
    2727#define FCOLLADA_EXPORT __declspec(dllimport)
    2828#define FCOLLADA_LOCAL
    2929#endif // FCOLLADA_INTERNAL
    30 #elif defined(__APPLE__) || defined(LINUX)
     30#elif defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3131#define FCOLLADA_EXPORT __attribute__((visibility("default")))
    3232#define FCOLLADA_LOCAL __attribute__((visibility("hidden")))
    3333#endif
    … …  
    7474#include <wchar.h>
    7575#include <stdint.h>
    7676
    77 #elif defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
     77#elif defined(__linux__) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    7878#include <ctype.h>
    7979#include <wctype.h>
    8080#include <unistd.h>
    … …  
    125125#endif // PLATFORMS
    126126
    127127// Important functions that some OSes have missing!
    128 #if defined(__APPLE__) || defined(LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
     128#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    129129inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; }
    130130inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; }
    131131inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; }
    … …  
    139139#elif defined(__PPU__)
    140140#define glClearDepth glClearDepthf
    141141
    142 #endif // __APPLE__ || LINUX || _FreeBSD__ || __FreeBSD_kernel__ || __OpenBSD__
     142#endif // __APPLE__ || __linux__ || __FreeBSD__ || __FreeBSD_kernel__ || __OpenBSD__
    143143
    144144// Cross-platform needed functions
    145145#ifdef WIN32

  • libraries/fcollada/include/FUtils/FUStringBuilder.h

     
    135135#else
    136136    inline void append(unsigned int i) { append((uint32) i); } /**< See above. */
    137137#endif
     138#elif defined(__APPLE__) || defined(__OpenBSD__)
     139    inline void append(size_t i) { append((uint64)i); }
    138140#endif // defined(WIN32)
    139141
    140142    /** Appends the floating-point value, after converting it to a string,

  • libraries/fcollada/include/FUtils/FUEvent.h

     
    1818#ifndef _FU_EVENT_H_
    1919#define _FU_EVENT_H_
    2020
    21 #ifndef _FU_FUNCTOR_H_
    2221#include "FUtils/FUFunctor.h"
    23 #endif // _FU_FUNCTOR_H_
    2422
    2523/**
    2624    An event with no argument.

  • libraries/fcollada/include/FUtils/FUFileManager.h

     
    1515#ifndef _FU_FILE_MANAGER_H_
    1616#define _FU_FILE_MANAGER_H_
    1717
    18 #ifndef _FU_URI_H_
     18#include "FMath/FMArray.h"
    1919#include "FUtils/FUUri.h"
    20 #endif //_FU_URI_H_
    2120
    22 #ifndef _FM_ARRAY_H_
    23 #include "FMath/FMArray.h"
    24 #endif //_FM_ARRAY_H_
    25 
    2621class FUFile;
    2722
    2823/** A scheme callback to load remote files.

  • libraries/fcollada/include/FUtils/FUCriticalSection.h

     
    3333#elif defined(__APPLE__)
    3434    //Do something here.
    3535    MPCriticalRegionID criticalSection;
    36 #elif defined(LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
     36#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3737#else
    3838#warning "FUCriticalSection: Critical section not implemented for other platforms."
    3939#endif

  • libraries/fcollada/include/FUtils/FUParameter.h

     
    167167/** See above. */
    168168#define InitializeParameter(parameterName, ...) parameterName(__VA_ARGS__)
    169169
    170 #if defined(__APPLE__) || defined(LINUX)
     170#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    171171#include "FUtils/FUParameter.hpp"
    172172#endif // __APPLE__
    173173

  • libraries/fcollada/include/FUtils/FUErrorLog.h

     
    1414#ifndef _FU_ERROR_LOG_H_
    1515#define _FU_ERROR_LOG_H_
    1616
    17 #ifndef _FU_ERROR_H_
    1817#include "FUtils/FUError.h"
    19 #endif // _FU_ERROR_H_
    2018
    2119class FULogFile;
    2220

  • libraries/fcollada/include/FUtils/FUAssert.h

     
    1414#ifndef _FU_ASSERT_H_
    1515#define _FU_ASSERT_H_
    1616
    17 #ifndef _FU_FUNCTOR_H_
    1817#include "FUtils/FUFunctor.h"
    19 #endif // _FU_FUNCTOR_H_
    2018
    2119namespace FUAssertion
    2220{

  • libraries/fcollada/include/FUtils/FUError.h

     
    1414#ifndef _FU_ERROR_H_
    1515#define _FU_ERROR_H_
    1616
    17 #ifndef _FU_EVENT_H_
     17#include "FUtils/FUCriticalSection.h"
    1818#include "FUtils/FUEvent.h"
    19 #endif // _FU_EVENT_H_
    20 #ifndef _FU_CRITICAL_SECTION_H_
    21 #include "FUtils/FUCriticalSection.h"
    22 #endif // _FU_CRITICAL_SECTION_H_
    2319
    2420/** Windows API defines this. */
    2521#undef ERROR

  • libraries/fcollada/include/FUtils/FUPluginManager.h

     
    4848        fstring filename;
    4949#if defined(WIN32)
    5050        HMODULE module;
    51 #elif defined(__APPLE__) || defined(LINUX)
     51#elif defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    5252        void* module;
    5353#endif // WIN32
    5454

  • libraries/fcollada/include/FCDocument/FCDEffectTools.h

     
    3333
    3434#if defined(WIN32)
    3535template <class T, int Q> class FCOLLADA_EXPORT FCDEffectParameterAnimatableT; /**< Trick Doxygen. */
    36 #elif defined(LINUX) || defined(__APPLE__)
     36#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3737template <class T, int Q> class FCDEffectParameterAnimatableT; /**< Trick Doxygen. */
    38 #endif // LINUX
     38#endif // __linux__
    3939typedef FCDEffectParameterAnimatableT<FMVector4, 1> FCDEffectParameterColor4; /**< A RGBA color effect parameter. */
    4040typedef FCDEffectParameterAnimatableT<float, 0> FCDEffectParameterFloat; /**< A floating-point value effect parameter. */
    4141

  • libraries/fcollada/include/FCDocument/FCDAnimationClip.h

     
    2222
    2323typedef FUTrackedList<FCDAnimationCurve> FCDAnimationCurveTrackList; /**< A dynamically-sized tracking array of animation curves. */
    2424
    25 #ifndef _FCD_ENTITY_H_
    2625#include "FCDocument/FCDEntity.h"
    27 #endif // _FCD_ENTITY_H_
    28 
    29 #ifndef _FCD_ENTITY_INSTANCE_H_
    3026#include "FCDocument/FCDEntityInstance.h"
    31 #endif // _FCD_ENTITY__INSTANCE_H_
    3227
    3328/**
    3429    A COLLADA animation clip.

  • libraries/fcollada/include/FCDocument/FCDControllerInstance.h

     
    1414#ifndef _FCD_CONTROLLER_INSTANCE_H_
    1515#define _FCD_CONTROLLER_INSTANCE_H_
    1616
    17 #ifndef _FCD_GEOMETRY_ENTITY_H_
    1817#include "FCDocument/FCDGeometryInstance.h"
    19 #endif // _FCD_GEOMETRY_ENTITY_H_
    20 
    21 #ifndef _FU_URI_H_
    2218#include "FUtils/FUUri.h"
    23 #endif // _FU_URI_H_
    2419
    2520class FCDSkinController;
    2621class FCDSceneNode;

  • libraries/fcollada/include/FCDocument/FCDEffectParameterSampler.h

     
    1414#ifndef _FCD_EFFECT_PARAMETER_SAMPLER_H_
    1515#define _FCD_EFFECT_PARAMETER_SAMPLER_H_
    1616
    17 #ifndef _FCD_EFFECT_PARAMETER_H_
    1817#include "FCDocument/FCDEffectParameter.h"
    19 #endif // _FCD_EFFECT_PARAMETER_H_
    20 
    21 #ifndef _FU_DAE_ENUM_H_
    2218#include "FUtils/FUDaeEnum.h"
    23 #endif // _FU_DAE_ENUM_H_
    2419
    2520class FCDocument;
    2621class FCDEffectPass;

  • libraries/fcollada/include/FCDocument/FCDController.h

     
    2020#ifndef _FCD_CONTROLLER_H_
    2121#define _FCD_CONTROLLER_H_
    2222
    23 #ifndef _FCD_ENTITY_H_
    2423#include "FCDocument/FCDEntity.h"
    25 #endif // _FCD_ENTITY_H_
    2624
    2725class FCDocument;
    2826class FCDGeometry;

  • libraries/fcollada/include/FCDocument/FCDEffectCode.h

     
    1414#ifndef _FCD_EFFECT_CODE_H_
    1515#define _FCD_EFFECT_CODE_H_
    1616
    17 #ifndef __FCD_OBJECT_H_
    1817#include "FCDocument/FCDObject.h"
    19 #endif // __FCD_OBJECT_H_
    2018
    2119class FCDocument;
    2220

  • libraries/fcollada/include/FCDocument/FCDAnimationChannel.h

     
    2020#ifndef _FCD_ANIMATION_CHANNEL_H_
    2121#define _FCD_ANIMATION_CHANNEL_H_
    2222
    23 #ifndef __FCD_OBJECT_H_
    2423#include "FCDocument/FCDObject.h"
    25 #endif // __FCD_OBJECT_H_
    26 #ifndef _FU_PARAMETER_H_
    2724#include "FUtils/FUParameter.h"
    28 #endif // _FU_PARAMETER_H_
    2925
    3026class FCDAnimated;
    3127class FCDAnimation;

  • libraries/fcollada/include/FCDocument/FCDEffectStandard.h

     
    3737
    3838#if defined(WIN32)
    3939template <class T, int Q> class FCOLLADA_EXPORT FCDEffectParameterAnimatableT; /**< Trick Doxygen. */
    40 #elif defined(LINUX) || defined(__APPLE__)
     40#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    4141template <class T, int Q> class FCDEffectParameterAnimatableT; /**< Trick Doxygen. */
    42 #endif // LINUX
     42#endif // __linux__
    4343typedef FCDEffectParameterAnimatableT<FMVector4, 1> FCDEffectParameterColor4; /**< A RGBA color effect parameter. */
    4444typedef FCDEffectParameterAnimatableT<float, 0> FCDEffectParameterFloat; /**< A floating-point value effect parameter. */
    4545

  • libraries/fcollada/include/FCDocument/FCDCamera.h

     
    2020#ifndef _FCD_CAMERA_H_
    2121#define _FCD_CAMERA_H_
    2222
    23 #ifndef _FCD_TARGETED_ENTITY_H_
     23#include "FCDocument/FCDParameterAnimatable.h"
    2424#include "FCDocument/FCDTargetedEntity.h"
    25 #endif // _FCD_TARGETED_ENTITY_H_
    26 #ifndef _FCD_PARAMETER_ANIMATABLE_H_
    27 #include "FCDocument/FCDParameterAnimatable.h"
    28 #endif // _FCD_PARAMETER_ANIMATABLE_H_
    2925
    3026class FCDocument;
    3127class FCDSceneNode;

  • libraries/fcollada/include/FCDocument/FCDAsset.h

     
    1313#ifndef _FCD_ASSET_H_
    1414#define _FCD_ASSET_H_
    1515
    16 #ifndef __FCD_OBJECT_H_
    1716#include "FCDocument/FCDObject.h"
    18 #endif // __FCD_OBJECT_H_
    19 #ifndef _FU_DATETIME_H_
    2017#include "FUtils/FUDateTime.h"
    21 #endif // _FU_DATETIME_H_
    22 #ifndef _FU_PARAMETER_H_
    2318#include "FUtils/FUParameter.h"
    24 #endif // _FU_PARAMETER_H_
    2519
    2620class FCDAssetContributor;
    2721

  • libraries/fcollada/include/FCDocument/FCDParameterAnimatable.h

     
    396396/** See above. */
    397397#define InitializeParameterAnimatable(parameterName, ...) parameterName(this, __VA_ARGS__)
    398398
    399 #if defined(__APPLE__) || defined(LINUX)
     399#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    400400#include <FCDocument/FCDParameterAnimatable.hpp>
    401401#endif // MAC + LINUX
    402402

  • libraries/fcollada/include/FCDocument/FCDAnimationMultiCurve.h

     
    2020#ifndef _FCD_ANIMATION_MULTI_CURVE_H_
    2121#define _FCD_ANIMATION_MULTI_CURVE_H_
    2222
    23 #ifndef __FCD_OBJECT_H_
    2423#include "FCDocument/FCDObject.h"
    25 #endif // __FCD_OBJECT_H_
    26 #ifndef _FU_DAE_ENUM_H_
    2724#include "FUtils/FUDaeEnum.h"
    28 #endif // _FU_DAE_ENUM_H_
    2925
    3026class FCDocument;
    3127class FCDAnimationMKey;

  • libraries/fcollada/include/FCDocument/FCDEffect.h

     
    2020#ifndef _FCD_EFFECT_H_
    2121#define _FCD_EFFECT_H_
    2222
    23 #ifndef _FU_DAE_ENUM_H_
     23#include "FCDocument/FCDEntity.h"
    2424#include "FUtils/FUDaeEnum.h"
    25 #endif // _FU_DAE_ENUM_H_
    26 #ifndef _FCD_ENTITY_H_
    27 #include "FCDocument/FCDEntity.h"
    28 #endif // _FCD_ENTITY_H_
    2925
    3026class FCDocument;
    3127class FCDEffectStandard;

  • libraries/fcollada/include/FCDocument/FCDAnimated.h

     
    2020#ifndef _FCD_ANIMATED_H_
    2121#define _FCD_ANIMATED_H_
    2222
    23 #ifndef __FCD_OBJECT_H_
    2423#include "FCDocument/FCDObject.h"
    25 #endif // __FCD_OBJECT_H_
    2624
    2725class FCDocument;
    2826class FCDAnimated;

  • libraries/fcollada/include/FCDocument/FCDEffectParameter.h

     
    1515#ifndef _FCD_EFFECT_PARAMETER_H_
    1616#define _FCD_EFFECT_PARAMETER_H_
    1717
    18 #ifndef __FCD_OBJECT_H_
    1918#include "FCDocument/FCDObject.h"
    20 #endif // __FCD_OBJECT_H_
    21 #ifndef _FCD_PARAMETER_ANIMATABLE_H_
    2219#include "FCDocument/FCDParameterAnimatable.h"
    23 #endif // _FCD_PARAMETER_ANIMATABLE_H_
    2420
    2521class FCDocument;
    2622class FCDEffectParameterAnnotation;
    … …  
    369365    DeclareParameter(fstring, FUParameterQualifiers::SIMPLE, value, FC("Value")); /**< The annotation value. */
    370366};
    371367
    372 #if defined(__APPLE__) || defined(LINUX)
     368#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    373369#include <FCDocument/FCDEffectParameter.hpp>
    374370#endif
    375371

  • libraries/fcollada/include/FCDocument/FCDAnimation.h

     
    2020#ifndef _FCD_ANIMATION_H_
    2121#define _FCD_ANIMATION_H_
    2222
    23 #ifndef _FCD_ENTITY_H_
    2423#include "FCDocument/FCDEntity.h"
    25 #endif // _FCD_ENTITY_H_
    2624
    2725class FCDocument;
    2826class FCDAnimated;

  • libraries/fcollada/include/FCDocument/FCDAnimationCurve.h

     
    1414#ifndef _FCD_ANIMATION_CURVE_H_
    1515#define _FCD_ANIMATION_CURVE_H_
    1616
    17 #ifndef _FU_DAE_ENUM_H_
     17#include "FCDocument/FCDObject.h"
    1818#include "FUtils/FUDaeEnum.h"
    19 #endif // _FU_DAE_ENUM_H_
    20 #ifndef __FCD_OBJECT_H_
    21 #include "FCDocument/FCDObject.h"
    22 #endif // __FCD_OBJECT_H_
    2319
    2420class FCDAnimated;
    2521class FCDAnimationClip;

  • libraries/fcollada/include/FCDocument/FCDocument.h

     
    2020#ifndef _FC_DOCUMENT_H_
    2121#define _FC_DOCUMENT_H_
    2222
    23 #ifndef __FCD_OBJECT_H_
    2423#include "FCDocument/FCDObject.h"
    25 #endif // __FCD_OBJECT_H_
    26 #ifndef _FU_PARAMETER_H_
    2724#include "FUtils/FUParameter.h"
    28 #endif // _FU_PARAMETER_H_
    2925
    3026#if defined(WIN32)
    3127template <class T> class FCOLLADA_EXPORT FCDLibrary; /**< Trick Doxygen. */
    3228template <class T> class FCOLLADA_EXPORT FUUniqueStringMapT; /**< Trick Doxygen. */
    33 #elif defined(LINUX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
     29#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3430template <class T> class FCDLibrary; /**< Trick Doxygen. */
    3531template <class T> class FUUniqueStringMapT; /**< Trick Doxygen. */
    36 #endif // LINUX
     32#endif // __linux__
    3733
    3834class FCDAnimated;
    3935class FCDAnimation;

  • libraries/fcollada/include/FCDocument/FCDTexture.h

     
    3535
    3636#if defined(WIN32)
    3737template <class T> class FCOLLADA_EXPORT FCDEffectParameterT; /**< Trick Doxygen. */
    38 #elif defined(LINUX) || defined(__APPLE__)
     38#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3939template <class T> class FCDEffectParameterT; /**< Trick Doxygen. */
    40 #endif // LINUX
     40#endif // __linux__
    4141typedef FCDEffectParameterT<int32> FCDEffectParameterInt; /**< An integer effect parameter. */
    4242
    4343/**

  • libraries/fcollada/src/FCollada/FCDocument/FCDAnimationClip.h

     
    2222
    2323typedef FUTrackedList<FCDAnimationCurve> FCDAnimationCurveTrackList; /**< A dynamically-sized tracking array of animation curves. */
    2424
    25 #ifndef _FCD_ENTITY_H_
    2625#include "FCDocument/FCDEntity.h"
    27 #endif // _FCD_ENTITY_H_
    28 
    29 #ifndef _FCD_ENTITY_INSTANCE_H_
    3026#include "FCDocument/FCDEntityInstance.h"
    31 #endif // _FCD_ENTITY__INSTANCE_H_
    3227
    3328/**
    3429    A COLLADA animation clip.

  • libraries/fcollada/src/FCollada/FCDocument/FCDControllerInstance.h

     
    1414#ifndef _FCD_CONTROLLER_INSTANCE_H_
    1515#define _FCD_CONTROLLER_INSTANCE_H_
    1616
    17 #ifndef _FCD_GEOMETRY_ENTITY_H_
    1817#include "FCDocument/FCDGeometryInstance.h"
    19 #endif // _FCD_GEOMETRY_ENTITY_H_
    20 
    21 #ifndef _FU_URI_H_
    2218#include "FUtils/FUUri.h"
    23 #endif // _FU_URI_H_
    2419
    2520class FCDSkinController;
    2621class FCDSceneNode;

  • libraries/fcollada/src/FCollada/FCDocument/FCDEffectParameterSampler.h

     
    1414#ifndef _FCD_EFFECT_PARAMETER_SAMPLER_H_
    1515#define _FCD_EFFECT_PARAMETER_SAMPLER_H_
    1616
    17 #ifndef _FCD_EFFECT_PARAMETER_H_
    1817#include "FCDocument/FCDEffectParameter.h"
    19 #endif // _FCD_EFFECT_PARAMETER_H_
    20 
    21 #ifndef _FU_DAE_ENUM_H_
    2218#include "FUtils/FUDaeEnum.h"
    23 #endif // _FU_DAE_ENUM_H_
    2419
    2520class FCDocument;
    2621class FCDEffectPass;

  • libraries/fcollada/src/FCollada/FCDocument/FCDController.h

     
    2020#ifndef _FCD_CONTROLLER_H_
    2121#define _FCD_CONTROLLER_H_
    2222
    23 #ifndef _FCD_ENTITY_H_
    2423#include "FCDocument/FCDEntity.h"
    25 #endif // _FCD_ENTITY_H_
    2624
    2725class FCDocument;
    2826class FCDGeometry;

  • libraries/fcollada/src/FCollada/FCDocument/FCDEffectCode.h

     
    1414#ifndef _FCD_EFFECT_CODE_H_
    1515#define _FCD_EFFECT_CODE_H_
    1616
    17 #ifndef __FCD_OBJECT_H_
    1817#include "FCDocument/FCDObject.h"
    19 #endif // __FCD_OBJECT_H_
    2018
    2119class FCDocument;
    2220

  • libraries/fcollada/src/FCollada/FCDocument/FCDAnimationChannel.h

     
    2020#ifndef _FCD_ANIMATION_CHANNEL_H_
    2121#define _FCD_ANIMATION_CHANNEL_H_
    2222
    23 #ifndef __FCD_OBJECT_H_
    2423#include "FCDocument/FCDObject.h"
    25 #endif // __FCD_OBJECT_H_
    26 #ifndef _FU_PARAMETER_H_
    2724#include "FUtils/FUParameter.h"
    28 #endif // _FU_PARAMETER_H_
    2925
    3026class FCDAnimated;
    3127class FCDAnimation;

  • libraries/fcollada/src/FCollada/FCDocument/FCDEffectStandard.h

     
    3737
    3838#if defined(WIN32)
    3939template <class T, int Q> class FCOLLADA_EXPORT FCDEffectParameterAnimatableT; /**< Trick Doxygen. */
    40 #elif defined(LINUX) || defined(__APPLE__)
     40#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    4141template <class T, int Q> class FCDEffectParameterAnimatableT; /**< Trick Doxygen. */
    42 #endif // LINUX
     42#endif // __linux__
    4343typedef FCDEffectParameterAnimatableT<FMVector4, 1> FCDEffectParameterColor4; /**< A RGBA color effect parameter. */
    4444typedef FCDEffectParameterAnimatableT<float, 0> FCDEffectParameterFloat; /**< A floating-point value effect parameter. */
    4545

  • libraries/fcollada/src/FCollada/FCDocument/FCDParameterAnimatable.h

     
    396396/** See above. */
    397397#define InitializeParameterAnimatable(parameterName, ...) parameterName(this, __VA_ARGS__)
    398398
    399 #if defined(__APPLE__) || defined(LINUX)
     399#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    400400#include <FCDocument/FCDParameterAnimatable.hpp>
    401401#endif // MAC + LINUX
    402402

  • libraries/fcollada/src/FCollada/FCDocument/FCDAnimationMultiCurve.h

     
    2020#ifndef _FCD_ANIMATION_MULTI_CURVE_H_
    2121#define _FCD_ANIMATION_MULTI_CURVE_H_
    2222
    23 #ifndef __FCD_OBJECT_H_
    2423#include "FCDocument/FCDObject.h"
    25 #endif // __FCD_OBJECT_H_
    26 #ifndef _FU_DAE_ENUM_H_
    2724#include "FUtils/FUDaeEnum.h"
    28 #endif // _FU_DAE_ENUM_H_
    2925
    3026class FCDocument;
    3127class FCDAnimationMKey;

  • libraries/fcollada/src/FCollada/FCDocument/FCDParameterAnimatable.cpp

     
    88
    99#include "StdAfx.h"
    1010#include "FCDParameterAnimatable.h"
    11 #if !defined (__APPLE__) && !defined(LINUX)
     11#if !defined(__APPLE__) && !defined(__linux__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__OpenBSD__)
    1212#include "FCDParameterAnimatable.hpp"
    1313#endif
    1414#include "FCDAnimated.h"

  • libraries/fcollada/src/FCollada/FCDocument/FCDAnimated.h

     
    2020#ifndef _FCD_ANIMATED_H_
    2121#define _FCD_ANIMATED_H_
    2222
    23 #ifndef __FCD_OBJECT_H_
    2423#include "FCDocument/FCDObject.h"
    25 #endif // __FCD_OBJECT_H_
    2624
    2725class FCDocument;
    2826class FCDAnimated;

  • libraries/fcollada/src/FCollada/FCDocument/FCDAnimation.h

     
    2020#ifndef _FCD_ANIMATION_H_
    2121#define _FCD_ANIMATION_H_
    2222
    23 #ifndef _FCD_ENTITY_H_
    2423#include "FCDocument/FCDEntity.h"
    25 #endif // _FCD_ENTITY_H_
    2624
    2725class FCDocument;
    2826class FCDAnimated;

  • libraries/fcollada/src/FCollada/FCDocument/FCDAnimationCurve.h

     
    1414#ifndef _FCD_ANIMATION_CURVE_H_
    1515#define _FCD_ANIMATION_CURVE_H_
    1616
    17 #ifndef _FU_DAE_ENUM_H_
     17#include "FCDocument/FCDObject.h"
    1818#include "FUtils/FUDaeEnum.h"
    19 #endif // _FU_DAE_ENUM_H_
    20 #ifndef __FCD_OBJECT_H_
    21 #include "FCDocument/FCDObject.h"
    22 #endif // __FCD_OBJECT_H_
    2319
    2420class FCDAnimated;
    2521class FCDAnimationClip;

  • libraries/fcollada/src/FCollada/FCDocument/FCDocument.h

     
    2020#ifndef _FC_DOCUMENT_H_
    2121#define _FC_DOCUMENT_H_
    2222
    23 #ifndef __FCD_OBJECT_H_
    2423#include "FCDocument/FCDObject.h"
    25 #endif // __FCD_OBJECT_H_
    26 #ifndef _FU_PARAMETER_H_
    2724#include "FUtils/FUParameter.h"
    28 #endif // _FU_PARAMETER_H_
    2925
    3026#if defined(WIN32)
    3127template <class T> class FCOLLADA_EXPORT FCDLibrary; /**< Trick Doxygen. */
    3228template <class T> class FCOLLADA_EXPORT FUUniqueStringMapT; /**< Trick Doxygen. */
    33 #elif defined(LINUX) || defined(__APPLE__) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
     29#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3430template <class T> class FCDLibrary; /**< Trick Doxygen. */
    3531template <class T> class FUUniqueStringMapT; /**< Trick Doxygen. */
    36 #endif // LINUX
     32#endif // __linux__
    3733
    3834class FCDAnimated;
    3935class FCDAnimation;

  • libraries/fcollada/src/FCollada/FCDocument/FCDEffectTools.h

     
    3333
    3434#if defined(WIN32)
    3535template <class T, int Q> class FCOLLADA_EXPORT FCDEffectParameterAnimatableT; /**< Trick Doxygen. */
    36 #elif defined(LINUX) || defined(__APPLE__)
     36#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3737template <class T, int Q> class FCDEffectParameterAnimatableT; /**< Trick Doxygen. */
    38 #endif // LINUX
     38#endif // __linux__
    3939typedef FCDEffectParameterAnimatableT<FMVector4, 1> FCDEffectParameterColor4; /**< A RGBA color effect parameter. */
    4040typedef FCDEffectParameterAnimatableT<float, 0> FCDEffectParameterFloat; /**< A floating-point value effect parameter. */
    4141

  • libraries/fcollada/src/FCollada/FCDocument/FCDCamera.h

     
    2020#ifndef _FCD_CAMERA_H_
    2121#define _FCD_CAMERA_H_
    2222
    23 #ifndef _FCD_TARGETED_ENTITY_H_
     23#include "FCDocument/FCDParameterAnimatable.h"
    2424#include "FCDocument/FCDTargetedEntity.h"
    25 #endif // _FCD_TARGETED_ENTITY_H_
    26 #ifndef _FCD_PARAMETER_ANIMATABLE_H_
    27 #include "FCDocument/FCDParameterAnimatable.h"
    28 #endif // _FCD_PARAMETER_ANIMATABLE_H_
    2925
    3026class FCDocument;
    3127class FCDSceneNode;

  • libraries/fcollada/src/FCollada/FCDocument/FCDAsset.h

     
    1313#ifndef _FCD_ASSET_H_
    1414#define _FCD_ASSET_H_
    1515
    16 #ifndef __FCD_OBJECT_H_
    1716#include "FCDocument/FCDObject.h"
    18 #endif // __FCD_OBJECT_H_
    19 #ifndef _FU_DATETIME_H_
    2017#include "FUtils/FUDateTime.h"
    21 #endif // _FU_DATETIME_H_
    22 #ifndef _FU_PARAMETER_H_
    2318#include "FUtils/FUParameter.h"
    24 #endif // _FU_PARAMETER_H_
    2519
    2620class FCDAssetContributor;
    2721

  • libraries/fcollada/src/FCollada/FCDocument/FCDEffectParameter.cpp

     
    1414#include "FCDEffectParameter.h"
    1515#include "FCDEffectParameterFactory.h"
    1616#include "FCDImage.h"
    17 #if !defined(__APPLE__) && !defined(LINUX)
     17#if !defined(__APPLE__) && !defined(__linux__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__OpenBSD__)
    1818#include "FCDEffectParameter.hpp"
    1919#endif
    2020

  • libraries/fcollada/src/FCollada/FCDocument/FCDEffect.h

     
    2020#ifndef _FCD_EFFECT_H_
    2121#define _FCD_EFFECT_H_
    2222
    23 #ifndef _FU_DAE_ENUM_H_
     23#include "FCDocument/FCDEntity.h"
    2424#include "FUtils/FUDaeEnum.h"
    25 #endif // _FU_DAE_ENUM_H_
    26 #ifndef _FCD_ENTITY_H_
    27 #include "FCDocument/FCDEntity.h"
    28 #endif // _FCD_ENTITY_H_
    2925
    3026class FCDocument;
    3127class FCDEffectStandard;

  • libraries/fcollada/src/FCollada/FCDocument/FCDEffectParameter.h

     
    1515#ifndef _FCD_EFFECT_PARAMETER_H_
    1616#define _FCD_EFFECT_PARAMETER_H_
    1717
    18 #ifndef __FCD_OBJECT_H_
    1918#include "FCDocument/FCDObject.h"
    20 #endif // __FCD_OBJECT_H_
    21 #ifndef _FCD_PARAMETER_ANIMATABLE_H_
    2219#include "FCDocument/FCDParameterAnimatable.h"
    23 #endif // _FCD_PARAMETER_ANIMATABLE_H_
    2420
    2521class FCDocument;
    2622class FCDEffectParameterAnnotation;
    … …  
    369365    DeclareParameter(fstring, FUParameterQualifiers::SIMPLE, value, FC("Value")); /**< The annotation value. */
    370366};
    371367
    372 #if defined(__APPLE__) || defined(LINUX)
     368#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    373369#include <FCDocument/FCDEffectParameter.hpp>
    374370#endif
    375371

  • libraries/fcollada/src/FCollada/FCDocument/FCDTexture.h

     
    3535
    3636#if defined(WIN32)
    3737template <class T> class FCOLLADA_EXPORT FCDEffectParameterT; /**< Trick Doxygen. */
    38 #elif defined(LINUX) || defined(__APPLE__)
     38#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3939template <class T> class FCDEffectParameterT; /**< Trick Doxygen. */
    40 #endif // LINUX
     40#endif // __linux__
    4141typedef FCDEffectParameterT<int32> FCDEffectParameterInt; /**< An integer effect parameter. */
    4242
    4343/**

  • libraries/fcollada/src/FCollada/Sconscript

     
    1212env.Append(CPPPATH = [sconscriptRelativePath, sconscriptRelativePath + "LibXML/include"])
    1313
    1414#Add the macros defined for all the builds
    15 env.Append(CPPDEFINES = ['LINUX'])
    1615if int(ifshared) != 0: env.Append(CPPDEFINES = ['FCOLLADA_DLL'])
    1716env.Append(CCFLAGS = ['-W', '-Wall', '-Wno-unused-parameter', '-Wno-unused-function'])
    1817

  • libraries/fcollada/src/FCollada/FColladaTest/Sconscript

     
    99env.Append(CPPPATH = [sconscriptRelativePath, sconscriptRelativePath + "/..", sconscriptRelativePath + "/../LibXML/include/"])
    1010
    1111#Add the macros defined for all the builds
    12 env.Append(CPPDEFINES = ['LINUX', '_DEBUG'])
     12env.Append(CPPDEFINES = ['_DEBUG'])
    1313env.Append(CCFLAGS = ['-O0', '-g', '-W', '-Wall'])
    1414
    1515#Unicode is pre-requisite to building the test for FCollada.

  • libraries/fcollada/src/FCollada/FUtils/FUCriticalSection.h

     
    3333#elif defined(__APPLE__)
    3434    //Do something here.
    3535    MPCriticalRegionID criticalSection;
    36 #elif defined(LINUX) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
     36#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3737#else
    3838#warning "FUCriticalSection: Critical section not implemented for other platforms."
    3939#endif

  • libraries/fcollada/src/FCollada/FUtils/FUFileManager.cpp

     
    2424#elif defined(__APPLE__)
    2525    #include <mach-o/dyld.h>
    2626    typedef int (*NSGetExecutablePathProcPtr)(char *buf, size_t *bufsize);
    27 #elif defined(LINUX)
     27#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    2828#include <sys/types.h>
    2929#include <sys/stat.h>
    3030#include <unistd.h>
    … …  
    210210    if (_mkdir(TO_STRING(absoluteDirectory).c_str()) == 0) return true;
    211211    errno_t err; _get_errno(&err);
    212212    if (err == EEXIST) return true;
    213 #elif defined(LINUX)
     213#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    214214    if (mkdir(TO_STRING(absoluteDirectory).c_str(), ~0u) == 0) return true; // I think this means all permissions..
    215215#elif defined(__APPLE__)
    216216    fm::string _fname = TO_STRING(directory);
    … …  
    374374    GetModuleFileName(NULL, buffer, 1024);
    375375    buffer[1023] = 0;
    376376    _uri = buffer;
    377 #elif defined(LINUX)
     377#elif defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    378378    char path[1024];
    379379    char path2[1024];
    380380    struct stat stat_buf;

  • libraries/fcollada/src/FCollada/FUtils/FUPluginManager.cpp

     
    2424        #define ffindclose _findclose
    2525        #define ffindnext _findnext
    2626    #endif
    27 #elif defined(__APPLE__) || defined(LINUX)
     27#elif defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    2828    #include <dlfcn.h>
    2929    #include <dirent.h>
    3030#endif //WIN32
    … …  
    128128            ffindclose(folderHandle);
    129129        }
    130130
    131 #elif defined(__APPLE__) || defined(LINUX)
     131#elif defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    132132        fm::string s_filter = TO_STRING(filter);
    133133        if (s_filter.length() > 0 && s_filter.front() == '*') s_filter.erase(0, 1);
    134134        if (s_filter.length() > 0 && s_filter.back() == '*') s_filter.pop_back();
    … …  
    179179    {
    180180#if defined(WIN32)
    181181        if ((*it)->module != NULL) FreeLibrary((*it)->module);
    182 #elif defined(LINUX) || defined(__APPLE__)
     182#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    183183        if ((*it)->module != NULL) dlclose((*it)->module);
    184184#endif // WIN32
    185185    }

  • libraries/fcollada/src/FCollada/FUtils/FUAssert.h

     
    1414#ifndef _FU_ASSERT_H_
    1515#define _FU_ASSERT_H_
    1616
    17 #ifndef _FU_FUNCTOR_H_
    1817#include "FUtils/FUFunctor.h"
    19 #endif // _FU_FUNCTOR_H_
    2018
    2119namespace FUAssertion
    2220{

  • libraries/fcollada/src/FCollada/FUtils/FUError.h

     
    1414#ifndef _FU_ERROR_H_
    1515#define _FU_ERROR_H_
    1616
    17 #ifndef _FU_EVENT_H_
     17#include "FUtils/FUCriticalSection.h"
    1818#include "FUtils/FUEvent.h"
    19 #endif // _FU_EVENT_H_
    20 #ifndef _FU_CRITICAL_SECTION_H_
    21 #include "FUtils/FUCriticalSection.h"
    22 #endif // _FU_CRITICAL_SECTION_H_
    2319
    2420/** Windows API defines this. */
    2521#undef ERROR

  • libraries/fcollada/src/FCollada/FUtils/Platforms.h

     
    2727#define FCOLLADA_EXPORT __declspec(dllimport)
    2828#define FCOLLADA_LOCAL
    2929#endif // FCOLLADA_INTERNAL
    30 #elif defined(__APPLE__) || defined(LINUX)
     30#elif defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    3131#define FCOLLADA_EXPORT __attribute__((visibility("default")))
    3232#define FCOLLADA_LOCAL __attribute__((visibility("hidden")))
    3333#endif
    … …  
    7474#include <wchar.h>
    7575#include <stdint.h>
    7676
    77 #elif defined(LINUX) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
     77#elif defined(__linux__) || defined(__PPU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    7878#include <ctype.h>
    7979#include <wctype.h>
    8080#include <unistd.h>
    … …  
    125125#endif // PLATFORMS
    126126
    127127// Important functions that some OSes have missing!
    128 #if defined(__APPLE__) || defined (LINUX) || defined (__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
     128#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    129129inline char* strlower(char* str) { char* it = str; while (*it != 0) { *it = tolower(*it); ++it; } return str; }
    130130inline wchar_t* wcslwr(wchar_t* str) { wchar_t* it = str; while (*it != 0) { *it = towlower(*it); ++it; } return str; }
    131131inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { wchar_t c1 = *s1, c2 = *s2; while (c1 != 0 && c2 != 0) { if (c1 >= 'a' && c1 <= 'z') c1 -= 'a' + 'A'; if (c2 >= 'a' && c2 <= 'z') c2 -= 'a' + 'A'; if (c2 < c1) return -1; else if (c2 > c1) return 1; c1 = *(++s1); c2 = *(++s2); } return 0; }
    … …  
    139139#elif defined(__PPU__)
    140140#define glClearDepth glClearDepthf
    141141
    142 #endif // __APPLE__ and LINUX
     142#endif // __APPLE__ || __linux__ || __FreeBSD__ || __FreeBSD_kernel__ || __OpenBSD__
    143143
    144144// Cross-platform needed functions
    145145#ifdef WIN32

  • libraries/fcollada/src/FCollada/FUtils/FUEvent.h

     
    1818#ifndef _FU_EVENT_H_
    1919#define _FU_EVENT_H_
    2020
    21 #ifndef _FU_FUNCTOR_H_
    2221#include "FUtils/FUFunctor.h"
    23 #endif // _FU_FUNCTOR_H_
    2422
    2523/**
    2624    An event with no argument.

  • libraries/fcollada/src/FCollada/FUtils/FUDebug.cpp

     
    1818FUDebug::FUDebug() {}
    1919FUDebug::~FUDebug() {}
    2020
    21 #if defined(LINUX) || defined(__APPLE__)
     21#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    2222#if defined(UNICODE)
    2323#define STRING_OUT(sz) fprintf(stderr, "%s", TO_STRING(sz).c_str()); fflush(stderr);
    2424#else

  • libraries/fcollada/src/FCollada/FUtils/FUFileManager.h

     
    1515#ifndef _FU_FILE_MANAGER_H_
    1616#define _FU_FILE_MANAGER_H_
    1717
    18 #ifndef _FU_URI_H_
     18#include "FMath/FMArray.h"
    1919#include "FUtils/FUUri.h"
    20 #endif //_FU_URI_H_
    2120
    22 #ifndef _FM_ARRAY_H_
    23 #include "FMath/FMArray.h"
    24 #endif //_FM_ARRAY_H_
    25 
    2621class FUFile;
    2722
    2823/** A scheme callback to load remote files.

  • libraries/fcollada/src/FCollada/FUtils/FUParameter.h

     
    167167/** See above. */
    168168#define InitializeParameter(parameterName, ...) parameterName(__VA_ARGS__)
    169169
    170 #if defined(__APPLE__) || defined(LINUX)
     170#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    171171#include "FUtils/FUParameter.hpp"
    172172#endif // __APPLE__
    173173

  • libraries/fcollada/src/FCollada/FUtils/FUParameter.cpp

     
    1010#include "FUParameterizable.h"
    1111#include "FUParameter.h"
    1212#include <FCDocument/FCDParameterAnimatable.h>
    13 #if !defined(__APPLE__) && !defined(LINUX)
     13#if !defined(__APPLE__) && !defined(__linux__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__OpenBSD__)
    1414#include "FUParameter.hpp"
    1515#endif
    1616

  • libraries/fcollada/src/FCollada/FUtils/FUErrorLog.h

     
    1414#ifndef _FU_ERROR_LOG_H_
    1515#define _FU_ERROR_LOG_H_
    1616
    17 #ifndef _FU_ERROR_H_
    1817#include "FUtils/FUError.h"
    19 #endif // _FU_ERROR_H_
    2018
    2119class FULogFile;
    2220

  • libraries/fcollada/src/FCollada/FUtils/FUPluginManager.h

     
    4848        fstring filename;
    4949#if defined(WIN32)
    5050        HMODULE module;
    51 #elif defined(__APPLE__) || defined(LINUX)
     51#elif defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    5252        void* module;
    5353#endif // WIN32
    5454

  • libraries/fcollada/src/FCollada/DLLEntry.cpp

     
    4444    hInstance = _hInstance;
    4545    return TRUE;
    4646}
    47 #elif defined(__APPLE__) || defined(LINUX)
     47#elif defined(__APPLE__) || defined(__linux__)  || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
    4848void __attribute((constructor)) DllEntry(void)
    4949{
    5050}

  • libraries/fcollada/src/FCollada/FMath/FMArrayPointer.h

     
    1515#ifndef _FM_ARRAY_POINTER_H_
    1616#define _FM_ARRAY_POINTER_H_
    1717
    18 #ifndef _FM_ARRAY_H_
    1918#include "FMath/FMArray.h"
    20 #endif // _FM_ARRAY_H_
    2119
    2220// Already documented in FMArray.h.
    2321namespace fm

  • libraries/fcollada/src/FCollada/FMath/FMTree.h

     
    1414#ifndef _FM_TREE_H_
    1515#define _FM_TREE_H_
    1616
    17 #ifndef _FM_ALLOCATOR_H_
    1817#include "FMath/FMAllocator.h"
    19 #endif // _FM_ALLOCATOR_H_
    2018
    2119namespace fm
    2220{

  • libraries/fcollada/src/FCollada/FMath/FMFloat.h

     
    1414#ifndef _FM_FLOAT_H_
    1515#define _FM_FLOAT_H_
    1616
    17 #if !defined(_INC_FLOAT) && (defined (WIN32) || defined (LINUX) || defined(__APPLE__))
     17#if !defined(_INC_FLOAT) && (defined (WIN32) || defined (__linux__) || defined(__APPLE__))
    1818#include <float.h>
    1919#endif // _INC_FLOAT, WIN32 and LINUX
    2020

  • libraries/fcollada/src/FCollada/FMath/FMArray.h

     
    1414#ifndef _FM_ARRAY_H_
    1515#define _FM_ARRAY_H_
    1616
    17 #ifndef _FM_ALLOCATOR_H_
    1817#include "FMath/FMAllocator.h"
    19 #endif // _FM_ALLOCATOR_H_
    20 #ifndef _FM_SORT_H_
    2118#include "FMath/FMSort.h"
    22 #endif // _FM_SORT_H_
    2319
    2420#ifdef WIN32
    2521#pragma warning(disable:4127)

  • libraries/fcollada/src/Makefile

     
    33ifeq ($(OS_ARCH),Darwin)
    44PIC_FLAGS ?= -fPIC
    55else
    6 OS_DEFINE ?= -DLINUX
    76PIC_FLAGS ?= -fpic
    87endif
    98
    109CXX ?= g++
    11 CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
     10CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(PIC_FLAGS) $(CPPFLAGS)
    1211CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
    1312CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
    1413# (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1)