Merge pull request #225 from ideasman42/linux-preproc-tweaks

Minor changes to preproc checks needed for building on Linux

toonz/sources/common/tiio/movsettings.cpp

@@ -7,7 +7,7 @@
 #include "tproperty.h"
 #include "tiio.h"
 
-#if !(defined(x64) || defined(__LP64__))
+#if !(defined(x64) || defined(__LP64__) || defined(LINUX))
 
 //*******************************************************************************
 //    32-bit version

toonz/sources/include/movsettings.h

@@ -13,7 +13,7 @@
 #define DVVAR DV_IMPORT_VAR
 #endif
 
-#if !(defined(x64) || defined(__LP64__))
+#if !(defined(x64) || defined(__LP64__) || defined(LINUX))
 
 #ifdef _WIN32
 

toonz/sources/include/tgl.h

@@ -21,6 +21,12 @@
 #define GLUT_NO_WARNING_DISABLE
 #endif
 
+#ifdef LINUX
+#include <GL/gl.h>
+#include <GL/glu.h>
+#include <GL/glut.h>
+#endif
+
 //#include "tcurves.h"
 #include "traster.h"
 //#include "tfilepath.h"

toonz/sources/include/tsound_t.h

@@ -431,7 +431,7 @@ public:
 };
 
 //==============================================================================
-#ifdef MACOSX
+#if defined(MACOSX) || defined(LINUX)
 template <class T>
 DVAPI TSoundTrackP TSoundTrackT<T>::apply(TSoundTransform *transform)
 {

toonz/sources/t32bitsrv/main.cpp

@@ -1,6 +1,6 @@
 
 
-#if (!(defined(x64) || defined(__LP64__)))
+#if (!(defined(x64) || defined(__LP64__) || defined(LINUX)))
 
 //Toonz includes
 #include "tiio_std.h"

toonz/sources/t32bitsrv/t323gpmsg.cpp

@@ -1,6 +1,6 @@
 
 
-#if (!(defined(x64) || defined(__LP64__)))
+#if (!(defined(x64) || defined(__LP64__) || defined(LINUX)))
 
 //Toonz stuff
 #include "tiio.h"

toonz/sources/t32bitsrv/t32movmsg.cpp

@@ -1,6 +1,6 @@
 
 
-#if (!(defined(x64) || defined(__LP64__)))
+#if (!(defined(x64) || defined(__LP64__) || defined(LINUX)))
 
 //Toonz stuff
 #include "tiio.h"

toonz/sources/toonz/main.cpp

@@ -437,6 +437,10 @@ int main(int argc, char *argv[])
 	fmt.setStencil(true);
 	QGLFormat::setDefaultFormat(fmt);
 
+#ifdef LINUX
+	glutInit(&argc, argv);
+#endif
+
 	splash.showMessage(offsetStr + "Initializing Toonz environment ...", Qt::AlignCenter, Qt::white);
 	a.processEvents();
 
@@ -495,7 +499,7 @@ int main(int argc, char *argv[])
 
 	// Carico la traduzione contenuta in toonz.qm (se � presente)
 	QString languagePathString = QString::fromStdString(toString(TEnv::getConfigDir() + "loc"));
-#ifdef MACOSX
+#ifndef WIN32
 	//the merge of menu on osx can cause problems with different languages with the Preferences menu
 	//qt_mac_set_menubar_merge(false);
 	languagePathString += "/" + Preferences::instance()->getCurrentLanguage();

toonz/sources/toonz/sceneviewer.cpp

@@ -1422,7 +1422,7 @@ void SceneViewer::paintGL()
 		/* QGLWidget の widget 生成/削除のタイミングで(platform によって?) GL_FRAMEBUFFER_UNDEFINED の状態で paintGL() が呼ばれてしまうようだ */
 		return;
 	}
-#ifndef MACOSX
+#ifdef WIN32
 	//following line is necessary to solve a problem Windows 7
 	SetWindowRgn((HWND)winId(), 0, FALSE);
 #else