Basic edits for Linux portability

2016-03-27 11:44:21 +11:00 · 2016-03-27 11:44:21 +11:00 · 107701249b
commit 107701249b
parent 79d38796c4
24 changed files with 62 additions and 11 deletions
--- a/toonz/sources/common/tfx/ttzpimagefx.cpp
+++ b/toonz/sources/common/tfx/ttzpimagefx.cpp
@ -5,6 +5,10 @@

 #include "ttzpimagefx.h"

+#ifdef LINUX
+#define strtok_s strtok_r
+#endif
+
 //**********************************************************************************************
 //    Global  functions
 //**********************************************************************************************
--- a/toonz/sources/common/tgl/tgl.cpp
+++ b/toonz/sources/common/tgl/tgl.cpp
@ -11,12 +11,14 @@
 #ifndef __sgi
 #ifdef WIN32
 #include <GL/glut.h>
+#elif defined(LINUX)
+#include <GL/glut.h>
 #else
 #include <GLUT/glut.h>
 #endif
 #endif

-#ifdef MACOSX
+#if defined(MACOSX) || defined(LINUX)
 #include <QGLContext>
 #endif

--- a/toonz/sources/common/tiio/compatibility/tfile_io.h
+++ b/toonz/sources/common/tiio/compatibility/tfile_io.h
@ -9,7 +9,7 @@ extern "C" {

 #include <stdio.h>

-#ifdef MACOSX
+#if defined(MACOSX) || defined(LINUX)
 #include <stddef.h>
 #endif

--- a/toonz/sources/common/tipc/tipc.cpp
+++ b/toonz/sources/common/tipc/tipc.cpp
@ -18,6 +18,9 @@
 #elif MACOSX
 #include <sys/sysctl.h>
 #include <unistd.h>
+#elif LINUX
+#include <sys/time.h>
+#include <unistd.h>
 #endif

 #include "tipc.h"
--- a/toonz/sources/common/tsystem/tpluginmanager.cpp
+++ b/toonz/sources/common/tsystem/tpluginmanager.cpp
@ -21,7 +21,9 @@
 #include <dirent.h>
 #include <sys/dir.h>
 #include <sys/param.h> // for getfsstat
+#ifdef MACOSX
 #include <sys/ucred.h>
+#endif
 #include <sys/mount.h>
 #include <pwd.h>
 #include <dlfcn.h>
@ -63,7 +65,7 @@ typedef const TPluginInfo *TnzLibMainProcType();
 namespace
 {
 const char *TnzLibMainProcName = "TLibMain";
-#ifdef MACOSX
+#if !defined(WIN32)
 const char *TnzLibMainProcName2 = "_TLibMain";
 #endif
 }
--- a/toonz/sources/common/tsystem/tsystempd.cpp
+++ b/toonz/sources/common/tsystem/tsystempd.cpp
@ -186,6 +186,11 @@ bool TSystem::memoryShortage()
 	// to be done...
 	return false;

+#elif defined(LINUX)
+
+	// to be done...
+	return false;
+
 #else

 	@ @ @ERROR : PLATFORM NOT SUPPORTED
--- a/toonz/sources/common/ttest/ttest.cpp
+++ b/toonz/sources/common/ttest/ttest.cpp
@ -15,6 +15,10 @@

 #include <set>

+#ifdef LINUX
+#include <typeinfo>
+#endif
+
 using namespace std;

 namespace
--- a/toonz/sources/common/tvrender/ttessellator.cpp
+++ b/toonz/sources/common/tvrender/ttessellator.cpp
@ -97,7 +97,7 @@ extern "C" void CALLBACK myCombine(GLdouble coords[3], GLdouble *d[4],
 typedef GLvoid(CALLBACK *GluCallback)(void);
 #endif

-#ifdef MACOSX
+#if defined(MACOSX) || defined(LINUX)

 typedef GLvoid (*GluCallback)();

--- a/toonz/sources/common/twain/twain.h
+++ b/toonz/sources/common/twain/twain.h
@ -97,6 +97,11 @@
 * Platform Dependent Definitions and Typedefs                              *
 ****************************************************************************/

+
+#ifdef LINUX
+#include <wchar.h>
+#endif
+
 /* Microsoft C/C++ Compiler */
 #if defined(WIN32) || defined(WIN64) || defined(_WINDOWS)
 #define TWH_CMP_MSC
--- a/toonz/sources/image/compatibility/tfile_io.h
+++ b/toonz/sources/image/compatibility/tfile_io.h
@ -13,6 +13,10 @@ extern "C" {
 #include <stddef.h>
 #endif

+#ifdef LINUX
+#include <wchar.h>
+#endif
+
 char *convertWCHAR2CHAR(const wchar_t *fname);

 #if defined(MACOSX) || defined(LINUX)
--- a/toonz/sources/include/tcg/hpp/triangulate.hpp
+++ b/toonz/sources/include/tcg/hpp/triangulate.hpp
@ -13,6 +13,8 @@
 #include <GL/glu.h>
 #elif MACOSX
 #include <GLUT/glut.h>
+#elif LINUX
+#include <GL/glut.h>
 #endif

 #ifndef TCG_GLU_CALLBACK
--- a/toonz/sources/include/tnztypes.h
+++ b/toonz/sources/include/tnztypes.h
@ -18,7 +18,7 @@ typedef uint32_t TUINT32;
 typedef int64_t TINT64;
 typedef uint64_t TUINT64;

-#elif defined(__LP64__)
+#elif defined(__LP64__) && (!defined(LINUX))

 #define TINT32 \
 	;          \
--- a/toonz/sources/include/tpixel.h
+++ b/toonz/sources/include/tpixel.h
@ -154,6 +154,8 @@ public:
 	Channel b, g, r, m;
 #elif TNZ_MACHINE_CHANNEL_ORDER_MRGB
 	Channel m, r, g, b;
+#elif TNZ_MACHINE_CHANNEL_ORDER_RGBM
+	Channel r, g, b, m;
 #else
 undefined machine order !!!!
 #endif
--- a/toonz/sources/include/tsound_t.h
+++ b/toonz/sources/include/tsound_t.h
@ -162,9 +162,9 @@ public:
 //----------------------------------------------------------------------------

 //!Applies a trasformation (echo, reverb, ect) to the object and returns the transformed soundtrack
-#ifdef MACOSX
+#if defined(MACOSX) || defined(LINUX)
 	TSoundTrackP apply(TSoundTransform *transform);
-#else
+#else // WIN32
 	TSoundTrackP apply(TSoundTransform *transform)
 	{
 		assert(transform);
--- a/toonz/sources/include/tthread.h
+++ b/toonz/sources/include/tthread.h
@ -35,7 +35,7 @@ void DVAPI shutdown();
 class ExecutorId; //Private
 class Runnable;

-#ifndef MACOSX
+#if !(defined(MACOSX) || defined(LINUX))
 template class TSmartPointerT<Runnable>;
 #endif
 typedef TSmartPointerT<Runnable> RunnableP;
--- a/toonz/sources/stdfx/igs_motion_blur.cpp
+++ b/toonz/sources/stdfx/igs_motion_blur.cpp
@ -2,6 +2,7 @@
 #include <stdexcept>		/* std::domain_error(-) */
 #include <limits>			/* std::numeric_limits */
 #include <cmath>			/* pow(-),abs(-) */
+#include <cstring>			/* memmove */
 #include "igs_ifx_common.h" /* igs::image::rgba */
 #include "igs_motion_blur.h"

--- a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
+++ b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp
@ -1,4 +1,5 @@
 #include <cerrno>
+#include <cstring>			/* memset */
 #include <vector>
 #include <stdexcept> // std::domain_error(-)
 #include <locale>
--- a/toonz/sources/tnzbase/tscanner/tscannerutil.cpp
+++ b/toonz/sources/tnzbase/tscanner/tscannerutil.cpp
@ -2,6 +2,10 @@

 #include "tscannerutil.h"

+#ifdef LINUX
+#include <cstring>
+#endif
+
 #define BUFBYTE(X, Y, BUF, BYTEWRAP, BITOFFS) \
 	(((UCHAR *)(BUF))[(((X) + (BITOFFS)) >> 3) + (Y) * (BYTEWRAP)])

--- a/toonz/sources/tnzext/plasticdeformer.cpp
+++ b/toonz/sources/tnzext/plasticdeformer.cpp
@ -12,6 +12,10 @@

 #include "ext/plasticdeformer.h"

+#if defined(LINUX)
+#include <cstring>
+#endif
+
 /*! \file plasticdeformer.cpp

  This file contains the implementation of a Mesh Deformer as specified in the
--- a/toonz/sources/tnzext/plastichandle.cpp
+++ b/toonz/sources/tnzext/plastichandle.cpp
@ -18,6 +18,10 @@ using namespace tcg::bgl;

 #include "ext/plastichandle.h"

+#if defined(LINUX)
+#include <cstring>
+#endif
+
 //***********************************************************************************************
 //    Distance building
 //***********************************************************************************************
--- a/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp
+++ b/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp
@ -4,6 +4,10 @@
 #include <stdlib.h>
 #include <memory>

+#if defined(LINUX)
+#include <cstring>
+#endif
+
 //blasint may either be common 4 bytes or extended 8 (long)...
 //Replace this and REBUILD the CBLAS with extended int if needed.
 typedef int blasint;
--- a/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
+++ b/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp
@ -17,7 +17,7 @@
 #include <QSettings>

 // MACOSX includes
-#ifdef MACOSX
+#if defined(MACOSX) || defined(LINUX)
 #include <netdb.h>	 // gethostbyname
 #include <arpa/inet.h> // inet_ntoa
 #endif
--- a/toonz/sources/toonzlib/autopos.cpp
+++ b/toonz/sources/toonzlib/autopos.cpp
@ -14,7 +14,7 @@ fare resize e realloc size dello stack a 65000 unita'

 */

-#ifdef MACOSX
+#if defined(MACOSX) || defined(LINUX)
 #define TRUE 1
 #define FALSE 0
 #endif
--- a/toonz/sources/toonzlib/trastercentroid.cpp
+++ b/toonz/sources/toonzlib/trastercentroid.cpp
@ -15,7 +15,7 @@
 #include "tmsg.h"
 #include "copP.h"*/

-#ifdef MACOSX
+#if defined(MACOSX) || defined(LINUX)
 #define TRUE 1
 #define FALSE 0
 #endif