razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

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

Browse source 
Minor changes to preproc checks needed for building on Linux
This commit is contained in:
Shinya Kitaoka 2016-04-25 17:25:42 +09:00
commit cd2d2022b0
9 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/common/tiio/movsettings.cpp
View file

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

2
toonz/sources/include/movsettings.h
View file

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

6
toonz/sources/include/tgl.h
View file

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

2
toonz/sources/include/tsound_t.h
View file

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

2
toonz/sources/t32bitsrv/main.cpp
View file

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

2
toonz/sources/t32bitsrv/t323gpmsg.cpp
View file

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

2
toonz/sources/t32bitsrv/t32movmsg.cpp
View file

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

6
toonz/sources/toonz/main.cpp
View file

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

2
toonz/sources/toonz/sceneviewer.cpp
View file

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