Use __APPLE__ in place of TARGET_OS_MAC

CMakeLists.txt

@@ -267,8 +267,6 @@ if(WIN32)
 endif()
 
 if(APPLE)
-  # TARGET_OS_MAC should be replaced with __APPLE__
-  add_definitions(-DTARGET_OS_MAC)
   # Dirty hack to prevent AIFF.h inclusion which provides `struct Marker`
   # conflicting with out `class Marker`.
   add_definitions(-D__AIFF__)

src/celengine/astro.cpp

@@ -418,7 +418,7 @@ const char* astro::Date::toCStr(Format format) const
     cal_time.tm_sec = (int)seconds;
     cal_time.tm_wday = wday;
     cal_time.tm_gmtoff = utc_offset;
-#if defined(TARGET_OS_MAC) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__)
     // tm_zone is a non-const string field on the Mac and FreeBSD (why?)
     cal_time.tm_zone = const_cast<char*>(tzname.c_str());
 #else

src/celengine/render.cpp

@@ -71,9 +71,9 @@ std::ofstream hdrlog;
 #ifdef _WIN32
 #include <GL/wglew.h>
 #else
-#ifndef TARGET_OS_MAC
+#ifndef __APPLE__
 #include <GL/glxew.h>
-#endif // TARGET_OS_MAC
+#endif // __APPLE__
 #endif //_WIN32
 #endif // VIDEO_SYNC
 #include <algorithm>
@@ -2215,7 +2215,7 @@ void Renderer::renderToBlurTexture(int blurLevel)
         drawGaussian3x3(xdelta, ydelta, blurTexWidth, blurTexHeight, 1.f);
         break;
 */
-#ifdef TARGET_OS_MAC
+#ifdef __APPLE__
     case 0:
         drawGaussian5x5(xdelta, ydelta, blurTexWidth, blurTexHeight, 1.f);
         break;

src/celestia/celestiacore.cpp

@@ -1148,7 +1148,7 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
     {
         wchar_t wc = 0; // Null wide character
         UTF8Decode(c_p, 0, strlen(c_p), wc);
-#ifdef TARGET_OS_MAC
+#ifdef __APPLE__
         if ( wc && (!iscntrl(wc)) )
 #else
         if ( wc && (!iswcntrl(wc)) )

src/celestia/celx_celestia.cpp

@@ -1920,7 +1920,7 @@ static int celestia_takescreenshot(lua_State* l)
 
 
     fs::path path = appCore->getConfig()->scriptScreenshotDirectory;
-#ifndef TARGET_OS_MAC
+#ifndef __APPLE__
     if (strncmp(filetype, "jpg", 3) == 0)
     {
         fs::path filepath = path / (filenamestem + ".jpg");

src/celestia/command.cpp

@@ -642,7 +642,7 @@ CommandCapture::CommandCapture(std::string _type,
 
 void CommandCapture::process(ExecutionEnvironment& env)
 {
-#ifndef TARGET_OS_MAC
+#ifndef __APPLE__
     const Renderer* r = env.getRenderer();
     if (r == nullptr)
         return;