Merge pull request #494 from zrax/apple

OSX fixes

CMakeLists.txt

@@ -69,14 +69,16 @@ endif()
 
 include(PrecompiledHeader)    #Precompiled Header helper macros
 
-# libCurl isn't smart enough to detect this for us, so we have to configure it ourselves
+if(WIN32)
-option(CURL_IS_STATIC "Using the static version of libcurl?" ON)
+    # libCurl isn't smart enough to detect this for us, so we have to configure it ourselves
-if(CURL_IS_STATIC)
+    option(CURL_IS_STATIC "Using the static version of libcurl?" ON)
-    add_definitions(-DCURL_STATICLIB)
+    if(CURL_IS_STATIC)
-endif(CURL_IS_STATIC)
+        add_definitions(-DCURL_STATICLIB)
-
+    endif(CURL_IS_STATIC)
-# Same story for expat
+
-option(EXPAT_IS_STATIC "Using the static version of libexpat" ON)
+    # Same story for expat
+    option(EXPAT_IS_STATIC "Using the static version of libexpat" ON)
+endif(WIN32)
 
 option(PLASMA_EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
 if(PLASMA_EXTERNAL_RELEASE)

Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp

@@ -65,6 +65,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plAvatar/plArmatureMod.h"
 #include "plAvatar/plPhysicalControllerCore.h"
 
+#include <cmath>
+
 // new stuff
 
 plCameraModifier1::plCameraModifier1() :

Sources/Plasma/FeatureLib/pfGameMgr/Pch.h

@@ -70,4 +70,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pfGameMgr.h"
 #include "Intern.h"
 
+#ifdef HS_BUILD_FOR_OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif

Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt

@@ -3,9 +3,12 @@ include_directories(../../PubUtilLib)
 
 include_directories(${EXPAT_INCLUDE_DIR})
 
-add_definitions(-DWIN32)
+if(WIN32)
-if(EXPAT_IS_STATIC)
+    add_definitions(-DWIN32)
-    add_definitions(-DXML_STATIC)
+
+    if(EXPAT_IS_STATIC)
+        add_definitions(-DXML_STATIC)
+    endif()
 endif()
 
 set(pfLocalizationMgr_SOURCES

Sources/Plasma/NucleusLib/pnAsyncCoreExe/Pch.h

@@ -61,4 +61,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "Private/Unix/pnAceUx.h"
 
 #include <process.h>
+
+#ifdef HS_BUILD_FOR_OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif

Sources/Plasma/NucleusLib/pnNetCli/Pch.h

@@ -59,4 +59,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnNetCli.h"
 #include "Intern.h"
 
+#ifdef HS_BUILD_FOR_OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif

Sources/Plasma/NucleusLib/pnNetProtocol/Pch.h

@@ -64,5 +64,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "Private/pnNpAllIncludes.h"
 #include "Intern.h"
 
-
+#ifdef HS_BUILD_FOR_OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif

Sources/Plasma/NucleusLib/pnUtils/Pch.h

@@ -51,7 +51,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnUtCoreLib.h"    // must be first in list
 #include "pnUtPragma.h"
 
+#ifdef HS_BUILD_FOR_OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 
 #ifdef HS_BUILD_FOR_WIN32
 #pragma warning(push, 3)

Sources/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.cpp

@@ -46,8 +46,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plFile/plInitFileReader.h"
 #include "plFile/plEncryptedStream.h"
 #include "hsStringTokenizer.h"
+
 #include <functional>
 #include <algorithm>
+#include <cmath>
 
 
 const uint32_t    plAgePage::kInvalidSeqSuffix = (uint32_t)-1;

Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp

@@ -41,8 +41,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *==LICENSE==*/
 #pragma warning(disable: 4503 4786)
 
-#include <algorithm>
-
 #include "plAvatarMgr.h"
 
 // local
@@ -87,6 +85,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnMessage/plTimeMsg.h"
 #include "plStatusLog/plStatusLog.h"
 
+#include <algorithm>
+#include <cmath>
+
 // The static single instance, allocated on demand by GetInstance()
 plAvatarMgr     *plAvatarMgr::fInstance = nil;
 

Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.cpp

@@ -111,7 +111,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include <algorithm>
 #include <sstream>
-
+#include <cmath>
 
 
 ////////////////////////////////////////////////////////////////////

Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp

@@ -66,7 +66,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsResMgr.h"
 
+#ifdef HS_BUILD_FOR_OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 
 extern  bool    gDataServerLocal;
 

Sources/Plasma/PubUtilLib/plNetGameLib/Pch.h

@@ -69,4 +69,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "Private/plNglAllIncludes.h"
 #include "Intern.h"
 
+#ifdef HS_BUILD_FOR_OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif

Sources/Plasma/PubUtilLib/plSDL/plStateVariable.cpp

@@ -39,8 +39,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
       Mead, WA   99021
 
 *==LICENSE==*/
-#include <cfloat>
-#include <type_traits>
 #include "hsStream.h"
 #include "hsTimer.h"
 #include "plSDL.h"
@@ -61,6 +59,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plResMgr/plResManager.h"
 #include "plUnifiedTime/plClientUnifiedTime.h"
 
+#include <type_traits>
+#include <cfloat>
+#include <cmath>
 
 /*****************************************************************************
 *

Sources/Plasma/PubUtilLib/plVault/Pch.h

@@ -93,4 +93,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "Intern.h"
 
+#ifdef HS_BUILD_FOR_OSX
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif

Sources/Tools/plFontConverter/CMakeLists.txt

@@ -40,9 +40,10 @@ qt5_wrap_ui(plFontConverter_UIC ${plFontConverter_UIC_SOURCES})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(plFontConverter WIN32 ${plFontConverter_HEADERS}
+add_executable(plFontConverter WIN32 MACOSX_BUNDLE
-               ${plFontConverter_SOURCES} ${plFontConverter_RCC}
+               ${plFontConverter_HEADERS} ${plFontConverter_SOURCES}
-               ${plFontConverter_UIC} ${plFontConverter_MOC})
+               ${plFontConverter_RCC} ${plFontConverter_UIC}
+               ${plFontConverter_MOC})
 
 target_link_libraries(plFontConverter CoreLib)
 target_link_libraries(plFontConverter pnKeyedObject)

Sources/Tools/plLocalizationEditor/CMakeLists.txt

@@ -42,9 +42,10 @@ qt5_wrap_ui(plLocalizationEditor_UIC ${plLocalizationEditor_UIC_SOURCES})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(plLocalizationEditor WIN32 ${plLocalizationEditor_HEADERS}
+add_executable(plLocalizationEditor WIN32 MACOSX_BUNDLE
-               ${plLocalizationEditor_SOURCES} ${plLocalizationEditor_RCC}
+               ${plLocalizationEditor_HEADERS} ${plLocalizationEditor_SOURCES}
-               ${plLocalizationEditor_UIC} ${plLocalizationEditor_MOC})
+               ${plLocalizationEditor_RCC} ${plLocalizationEditor_UIC}
+               ${plLocalizationEditor_MOC})
 
 target_link_libraries(plLocalizationEditor CoreLib)
 target_link_libraries(plLocalizationEditor pnSceneObject)

Sources/Tools/plResBrowser/CMakeLists.txt

@@ -44,7 +44,8 @@ qt5_wrap_ui(plResBrowser_UIC ${plResBrowser_UIC_SOURCES})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_executable(plResBrowser WIN32 ${plResBrowser_SOURCES} ${plResBrowser_HEADERS}
+add_executable(plResBrowser WIN32 MACOSX_BUNDLE
+               ${plResBrowser_SOURCES} ${plResBrowser_HEADERS}
                ${plResBrowser_RCC} ${plResBrowser_UIC} ${plResBrowser_MOC})
 
 target_link_libraries(plResBrowser CoreLib)