diff --git a/toonz/sources/common/tcore/tthread.cpp b/toonz/sources/common/tcore/tthread.cpp index a487b77d..3189b8cb 100644 --- a/toonz/sources/common/tcore/tthread.cpp +++ b/toonz/sources/common/tcore/tthread.cpp @@ -10,7 +10,7 @@ #include "tatomicvar.h" #include "tthread.h" -#include "tthreadP.h" +#include "tthreadp.h" // STL includes #include diff --git a/toonz/sources/common/tfx/ttzpimagefx.cpp b/toonz/sources/common/tfx/ttzpimagefx.cpp index e9c16b89..97798466 100644 --- a/toonz/sources/common/tfx/ttzpimagefx.cpp +++ b/toonz/sources/common/tfx/ttzpimagefx.cpp @@ -11,7 +11,7 @@ void parseIndexes(string indexes, vector &items) { -#ifndef MACOSX +#ifdef WIN32 char seps[] = " ,;"; char *token; if (indexes == "all" || indexes == "All" || indexes == "ALL") @@ -39,7 +39,7 @@ void parseIndexes(string indexes, vector &items) void insertIndexes(vector items, PaletteFilterFxRenderData *t) { -#ifndef MACOSX +#ifdef WIN32 for (int i = 0; i < (int)items.size(); i++) { char *starttoken, *endtoken; char subseps[] = "-"; diff --git a/toonz/sources/common/tgl/tgl.cpp b/toonz/sources/common/tgl/tgl.cpp index 4dad3e4b..687fe0a8 100644 --- a/toonz/sources/common/tgl/tgl.cpp +++ b/toonz/sources/common/tgl/tgl.cpp @@ -11,12 +11,14 @@ #ifndef __sgi #ifdef WIN32 #include +#elif defined(LINUX) +#include #else #include #endif #endif -#ifdef MACOSX +#if defined(MACOSX) || defined(LINUX) #include #endif diff --git a/toonz/sources/common/tiio/compatibility/tfile_io.h b/toonz/sources/common/tiio/compatibility/tfile_io.h index c40ea202..2c3fe91a 100644 --- 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 -#ifdef MACOSX +#if defined(MACOSX) || defined(LINUX) #include #endif diff --git a/toonz/sources/common/tipc/tipc.cpp b/toonz/sources/common/tipc/tipc.cpp index 3c6f7ec4..3fca4bfd 100644 --- a/toonz/sources/common/tipc/tipc.cpp +++ b/toonz/sources/common/tipc/tipc.cpp @@ -18,6 +18,9 @@ #elif MACOSX #include #include +#elif LINUX +#include +#include #endif #include "tipc.h" diff --git a/toonz/sources/common/tsystem/tlogger.cpp b/toonz/sources/common/tsystem/tlogger.cpp index 151c3bb3..c21b1da6 100644 --- a/toonz/sources/common/tsystem/tlogger.cpp +++ b/toonz/sources/common/tsystem/tlogger.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include using std::endl; diff --git a/toonz/sources/common/tsystem/tpluginmanager.cpp b/toonz/sources/common/tsystem/tpluginmanager.cpp index 0d5daef8..0e002aae 100644 --- a/toonz/sources/common/tsystem/tpluginmanager.cpp +++ b/toonz/sources/common/tsystem/tpluginmanager.cpp @@ -21,7 +21,9 @@ #include #include #include // for getfsstat +#ifdef MACOSX #include +#endif #include #include #include @@ -63,7 +65,7 @@ typedef const TPluginInfo *TnzLibMainProcType(); namespace { const char *TnzLibMainProcName = "TLibMain"; -#ifdef MACOSX +#if !defined(WIN32) const char *TnzLibMainProcName2 = "_TLibMain"; #endif } diff --git a/toonz/sources/common/tsystem/tsystem.cpp b/toonz/sources/common/tsystem/tsystem.cpp index 510063d5..1ceb34f7 100644 --- a/toonz/sources/common/tsystem/tsystem.cpp +++ b/toonz/sources/common/tsystem/tsystem.cpp @@ -10,26 +10,26 @@ using namespace std; #ifndef TNZCORE_LIGHT -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef WIN32 #include #include #include #else -#include -#include +#include +#include #endif #include diff --git a/toonz/sources/common/tsystem/tsystempd.cpp b/toonz/sources/common/tsystem/tsystempd.cpp index cb2a3324..f1db6155 100644 --- 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 diff --git a/toonz/sources/common/ttest/ttest.cpp b/toonz/sources/common/ttest/ttest.cpp index 303fa41d..568bf80a 100644 --- a/toonz/sources/common/ttest/ttest.cpp +++ b/toonz/sources/common/ttest/ttest.cpp @@ -15,6 +15,10 @@ #include +#if defined(LINUX) +#include +#endif + using namespace std; namespace diff --git a/toonz/sources/common/tvrender/ttessellator.cpp b/toonz/sources/common/tvrender/ttessellator.cpp index f516003d..ab48aaee 100644 --- 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)(); diff --git a/toonz/sources/common/twain/twain.h b/toonz/sources/common/twain/twain.h index 8a27515b..84ae0a1d 100644 --- 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 +#endif + /* Microsoft C/C++ Compiler */ #if defined(WIN32) || defined(WIN64) || defined(_WINDOWS) #define TWH_CMP_MSC diff --git a/toonz/sources/image/compatibility/tfile_io.h b/toonz/sources/image/compatibility/tfile_io.h index c40ea202..3a0c1392 100644 --- a/toonz/sources/image/compatibility/tfile_io.h +++ b/toonz/sources/image/compatibility/tfile_io.h @@ -13,6 +13,10 @@ extern "C" { #include #endif +#ifdef LINUX +#include +#endif + char *convertWCHAR2CHAR(const wchar_t *fname); #if defined(MACOSX) || defined(LINUX) diff --git a/toonz/sources/image/tzl/tiio_tzl.cpp b/toonz/sources/image/tzl/tiio_tzl.cpp index c7ec77dd..62fbbb97 100644 --- a/toonz/sources/image/tzl/tiio_tzl.cpp +++ b/toonz/sources/image/tzl/tiio_tzl.cpp @@ -21,7 +21,7 @@ #include "tconvert.h" #include "trasterimage.h" -#include "QByteArray.h" +#include #if !defined(TNZ_LITTLE_ENDIAN) TNZ_LITTLE_ENDIAN undefined !! diff --git a/toonz/sources/include/tcg/hpp/triangulate.hpp b/toonz/sources/include/tcg/hpp/triangulate.hpp index 7230e830..5b51bd92 100644 --- a/toonz/sources/include/tcg/hpp/triangulate.hpp +++ b/toonz/sources/include/tcg/hpp/triangulate.hpp @@ -13,6 +13,8 @@ #include #elif MACOSX #include +#elif LINUX +#include #endif #ifndef TCG_GLU_CALLBACK diff --git a/toonz/sources/include/tcontenthistory.h b/toonz/sources/include/tcontenthistory.h index 230ad824..a5632796 100644 --- a/toonz/sources/include/tcontenthistory.h +++ b/toonz/sources/include/tcontenthistory.h @@ -5,8 +5,8 @@ #include "tcommon.h" #include "tfilepath.h" -#include -#include +#include +#include #include #include diff --git a/toonz/sources/include/tconvert.h b/toonz/sources/include/tconvert.h index ff0b77e7..c496867c 100644 --- a/toonz/sources/include/tconvert.h +++ b/toonz/sources/include/tconvert.h @@ -73,7 +73,7 @@ DVAPI wstring toUpper(wstring a); DVAPI wstring toLower(wstring a); #ifndef TNZCORE_LIGHT -#include +#include inline bool fromStr(int &v, QString s) { diff --git a/toonz/sources/include/tfarmtask.h b/toonz/sources/include/tfarmtask.h index 55d5c5e6..aa052983 100644 --- a/toonz/sources/include/tfarmtask.h +++ b/toonz/sources/include/tfarmtask.h @@ -3,7 +3,7 @@ #include -#include +#include #include "tpersist.h" #include "tfarmplatforms.h" #include "tfilepath.h" diff --git a/toonz/sources/include/tmsgcore.h b/toonz/sources/include/tmsgcore.h index d5394a7d..8e328dac 100644 --- a/toonz/sources/include/tmsgcore.h +++ b/toonz/sources/include/tmsgcore.h @@ -2,7 +2,7 @@ #pragma once -#include +#include #include #include "tcommon.h" diff --git a/toonz/sources/include/tnztypes.h b/toonz/sources/include/tnztypes.h index c37c6574..3e70dfc8 100644 --- 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 \ ; \ diff --git a/toonz/sources/include/toonz/scriptbinding_files.h b/toonz/sources/include/toonz/scriptbinding_files.h index 08371f59..26117380 100644 --- a/toonz/sources/include/toonz/scriptbinding_files.h +++ b/toonz/sources/include/toonz/scriptbinding_files.h @@ -6,7 +6,7 @@ #include "toonz/scriptbinding.h" #include "tfilepath.h" -#include +#include namespace TScriptBinding { diff --git a/toonz/sources/include/toonz/ttileset.h b/toonz/sources/include/toonz/ttileset.h index 360188dd..fc675ea1 100644 --- a/toonz/sources/include/toonz/ttileset.h +++ b/toonz/sources/include/toonz/ttileset.h @@ -4,7 +4,7 @@ #define TTILESET_HEADER #include "trastercm.h" -#include +#include #undef DVAPI #undef DVVAR diff --git a/toonz/sources/include/toonzqt/schematicgroupeditor.h b/toonz/sources/include/toonzqt/schematicgroupeditor.h index b7b44476..0d7f4034 100644 --- a/toonz/sources/include/toonzqt/schematicgroupeditor.h +++ b/toonz/sources/include/toonzqt/schematicgroupeditor.h @@ -4,7 +4,7 @@ #define SCHEMATICGROUPEDITOR_H #include "tcommon.h" -#include +#include #include "tgeometry.h" #undef DVAPI diff --git a/toonz/sources/include/tpixel.h b/toonz/sources/include/tpixel.h index 49ba0d30..4014f18c 100644 --- 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 diff --git a/toonz/sources/include/tscanner.h b/toonz/sources/include/tscanner.h index 13d45e1d..4444c744 100644 --- a/toonz/sources/include/tscanner.h +++ b/toonz/sources/include/tscanner.h @@ -9,7 +9,7 @@ #include "trasterimage.h" #include -#include +#include #undef DVAPI #undef DVVAR #ifdef TNZBASE_EXPORTS diff --git a/toonz/sources/include/tsound_t.h b/toonz/sources/include/tsound_t.h index 1c1e7945..9f4690b3 100644 --- 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); diff --git a/toonz/sources/include/tsystem.h b/toonz/sources/include/tsystem.h index 79bacc7e..b7209d47 100644 --- a/toonz/sources/include/tsystem.h +++ b/toonz/sources/include/tsystem.h @@ -28,7 +28,7 @@ #ifndef TNZCORE_LIGHT -#include +#include DVAPI ostream &operator<<(ostream &out, const QDateTime &t); diff --git a/toonz/sources/include/tthread.h b/toonz/sources/include/tthread.h index d9209da8..4798608c 100644 --- 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; #endif typedef TSmartPointerT RunnableP; diff --git a/toonz/sources/stdfx/igs_motion_blur.cpp b/toonz/sources/stdfx/igs_motion_blur.cpp index 9daed9fb..defd02db 100644 --- a/toonz/sources/stdfx/igs_motion_blur.cpp +++ b/toonz/sources/stdfx/igs_motion_blur.cpp @@ -2,6 +2,7 @@ #include /* std::domain_error(-) */ #include /* std::numeric_limits */ #include /* pow(-),abs(-) */ +#include /* memmove */ #include "igs_ifx_common.h" /* igs::image::rgba */ #include "igs_motion_blur.h" diff --git a/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp b/toonz/sources/stdfx/igs_resource_msg_from_err_unix.cpp index 00982452..4958feef 100644 --- 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 +#include /* memset */ #include #include // std::domain_error(-) #include diff --git a/toonz/sources/tnzbase/tscanner/tscannerutil.cpp b/toonz/sources/tnzbase/tscanner/tscannerutil.cpp index 6da313e5..9d5d3fca 100644 --- a/toonz/sources/tnzbase/tscanner/tscannerutil.cpp +++ b/toonz/sources/tnzbase/tscanner/tscannerutil.cpp @@ -2,6 +2,8 @@ #include "tscannerutil.h" +#include + #define BUFBYTE(X, Y, BUF, BYTEWRAP, BITOFFS) \ (((UCHAR *)(BUF))[(((X) + (BITOFFS)) >> 3) + (Y) * (BYTEWRAP)]) diff --git a/toonz/sources/tnzext/plasticdeformer.cpp b/toonz/sources/tnzext/plasticdeformer.cpp index 6dfd6c12..8e6ed297 100644 --- a/toonz/sources/tnzext/plasticdeformer.cpp +++ b/toonz/sources/tnzext/plasticdeformer.cpp @@ -12,6 +12,8 @@ #include "ext/plasticdeformer.h" +#include + /*! \file plasticdeformer.cpp This file contains the implementation of a Mesh Deformer as specified in the diff --git a/toonz/sources/tnzext/plastichandle.cpp b/toonz/sources/tnzext/plastichandle.cpp index efe294c8..46351a14 100644 --- a/toonz/sources/tnzext/plastichandle.cpp +++ b/toonz/sources/tnzext/plastichandle.cpp @@ -18,6 +18,8 @@ using namespace tcg::bgl; #include "ext/plastichandle.h" +#include + //*********************************************************************************************** // Distance building //*********************************************************************************************** diff --git a/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp b/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp index 171245fc..d10f473e 100644 --- a/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp +++ b/toonz/sources/tnzext/tlin/tlin_cblas_wrap.cpp @@ -3,6 +3,7 @@ #include #include #include +#include //blasint may either be common 4 bytes or extended 8 (long)... //Replace this and REBUILD the CBLAS with extended int if needed. diff --git a/toonz/sources/tnztools/plastictool.cpp b/toonz/sources/tnztools/plastictool.cpp index 3fe5bf37..ea588429 100644 --- a/toonz/sources/tnztools/plastictool.cpp +++ b/toonz/sources/tnztools/plastictool.cpp @@ -37,7 +37,7 @@ // Qt includes #include #include -#include +#include #include #include #include diff --git a/toonz/sources/toonz/batches.cpp b/toonz/sources/toonz/batches.cpp index c8f2c4c2..4a9c5e65 100644 --- a/toonz/sources/toonz/batches.cpp +++ b/toonz/sources/toonz/batches.cpp @@ -24,8 +24,8 @@ #include "toonzqt/gutil.h" -#include -#include +#include +#include #include namespace diff --git a/toonz/sources/toonz/batches.h b/toonz/sources/toonz/batches.h index 1579df47..1b67d244 100644 --- a/toonz/sources/toonz/batches.h +++ b/toonz/sources/toonz/batches.h @@ -3,11 +3,11 @@ #ifndef BATCHES_H #define BATCHES_H -#include +#include #include #include #include -#include +#include #include "tfarmtask.h" #include "tfilepath.h" #include "tthread.h" diff --git a/toonz/sources/toonz/filmstripcommand.cpp b/toonz/sources/toonz/filmstripcommand.cpp index 40619647..f0047763 100644 --- a/toonz/sources/toonz/filmstripcommand.cpp +++ b/toonz/sources/toonz/filmstripcommand.cpp @@ -16,7 +16,7 @@ #include "drawingdata.h" #include "toonzqt/strokesdata.h" #include "toonzqt/rasterimagedata.h" -#include "timageCache.h" +#include "timagecache.h" #include "tools/toolutils.h" #include "toonzqt/icongenerator.h" diff --git a/toonz/sources/toonz/history.h b/toonz/sources/toonz/history.h index 34cacd58..d260e929 100644 --- a/toonz/sources/toonz/history.h +++ b/toonz/sources/toonz/history.h @@ -7,7 +7,7 @@ #include "tsystem.h" #include -#include +#include class History { // singleton diff --git a/toonz/sources/toonz/insertfxpopup.h b/toonz/sources/toonz/insertfxpopup.h index 7ef85e50..fe79d690 100644 --- a/toonz/sources/toonz/insertfxpopup.h +++ b/toonz/sources/toonz/insertfxpopup.h @@ -4,7 +4,7 @@ #define INSERTFXPOPUP_H #include "toonzqt/dvdialog.h" -#include "tfilePath.h" +#include "tfilepath.h" #include "tstream.h" // forward declaration diff --git a/toonz/sources/toonz/matchline.cpp b/toonz/sources/toonz/matchline.cpp index fa375935..796d188b 100644 --- a/toonz/sources/toonz/matchline.cpp +++ b/toonz/sources/toonz/matchline.cpp @@ -15,7 +15,7 @@ // TnzLib includes #include "toonz/txsheet.h" #include "toonz/toonzscene.h" -#include "toonz/levelSet.h" +#include "toonz/levelset.h" #include "toonz/txshsimplelevel.h" #include "toonz/txshlevelcolumn.h" #include "toonz/txshcell.h" diff --git a/toonz/sources/toonz/mergecmapped.cpp b/toonz/sources/toonz/mergecmapped.cpp index c7ec7b8d..7e001724 100644 --- a/toonz/sources/toonz/mergecmapped.cpp +++ b/toonz/sources/toonz/mergecmapped.cpp @@ -4,7 +4,7 @@ #include "tpalette.h" #include "toonz/txsheet.h" #include "toonz/toonzscene.h" -#include "toonz/levelSet.h" +#include "toonz/levelset.h" #include "toonz/txshsimplelevel.h" #include "toonz/txshlevelcolumn.h" #include "toonz/txshcell.h" diff --git a/toonz/sources/toonz/mergecolumns.cpp b/toonz/sources/toonz/mergecolumns.cpp index 6a1ccc5f..a6ac1437 100644 --- a/toonz/sources/toonz/mergecolumns.cpp +++ b/toonz/sources/toonz/mergecolumns.cpp @@ -4,7 +4,7 @@ #include "tpalette.h" #include "toonz/txsheet.h" #include "toonz/toonzscene.h" -#include "toonz/levelSet.h" +#include "toonz/levelset.h" #include "toonz/txshsimplelevel.h" #include "toonz/txshlevelcolumn.h" #include "toonz/txshcell.h" diff --git a/toonz/sources/toonz/scenesettingspopup.cpp b/toonz/sources/toonz/scenesettingspopup.cpp index 937eff5d..3bdbee2b 100644 --- a/toonz/sources/toonz/scenesettingspopup.cpp +++ b/toonz/sources/toonz/scenesettingspopup.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include using namespace DVGui; diff --git a/toonz/sources/toonz/viewerdraw.cpp b/toonz/sources/toonz/viewerdraw.cpp index 1ac57f9a..364894e0 100644 --- a/toonz/sources/toonz/viewerdraw.cpp +++ b/toonz/sources/toonz/viewerdraw.cpp @@ -7,7 +7,7 @@ #include "toonz/tframehandle.h" #include "toonz/tcolumnhandle.h" #include "toonz/tobjecthandle.h" -#include "toonz/cleanupParameters.h" +#include "toonz/cleanupparameters.h" #include "sceneviewer.h" #include "ruler.h" diff --git a/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp b/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp index f91e492a..2e366c94 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp @@ -17,7 +17,7 @@ #include // MACOSX includes -#ifdef MACOSX +#if defined(MACOSX) || defined(LINUX) #include // gethostbyname #include // inet_ntoa #endif diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp index abbaedac..fc74e179 100644 --- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp @@ -49,6 +49,10 @@ using namespace std; #include //To retrieve MAC HW infos #endif +#ifdef LINUX +#include +#endif + // forward declaration class FarmServer; @@ -693,6 +697,7 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo) hwInfo.m_type = Irix; #else +#ifdef MACOSX int mib[2]; TINT64 physMemSize; size_t len; @@ -701,6 +706,11 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo) mib[1] = HW_MEMSIZE; len = sizeof(physMemSize); sysctl(mib, 2, &physMemSize, &len, NULL, 0); +#endif + +#ifdef LINUX + TINT64 physMemSize = (TINT64)sysconf(_SC_PHYS_PAGES) * (TINT64)sysconf(_SC_PAGE_SIZE); +#endif hwInfo.m_cpuCount = TSystem::getProcessorCount(); diff --git a/toonz/sources/toonzlib/autopos.cpp b/toonz/sources/toonzlib/autopos.cpp index 18f8c34d..9c5e403c 100644 --- 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 diff --git a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp index f0448d3c..43573334 100644 --- a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp +++ b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp @@ -8,7 +8,7 @@ #include #include #include -#include "YombInputParam.h" +#include "YOMBInputParam.h" //#include "tmsg.h" #ifdef WIN32 #pragma warning(disable : 4996) diff --git a/toonz/sources/toonzlib/sandor_fxs/YOMBParam.cpp b/toonz/sources/toonzlib/sandor_fxs/YOMBParam.cpp index ee426ec6..e1aa37a4 100644 --- a/toonz/sources/toonzlib/sandor_fxs/YOMBParam.cpp +++ b/toonz/sources/toonzlib/sandor_fxs/YOMBParam.cpp @@ -14,7 +14,7 @@ #include #include "YOMBParam.h" #include "InputParam.h" -#include "YombInputParam.h" +#include "YOMBInputParam.h" #include "STColSelPic.h" #include "BlurMatrix.h" #include "SDef.h" diff --git a/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h b/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h index b7d78fed..bcce4cc8 100644 --- a/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h +++ b/toonz/sources/toonzlib/sandor_fxs/YOMBParam.h @@ -15,7 +15,7 @@ #include "STColSelPic.h" #include "SDef.h" #include "InputParam.h" -#include "YombInputParam.h" +#include "YOMBInputParam.h" #include "BlurMatrix.h" //#pragma warning(disable: 4786) //#include "tmsg.h" diff --git a/toonz/sources/toonzlib/studiopalettecmd.cpp b/toonz/sources/toonzlib/studiopalettecmd.cpp index 4edb8a79..6d7e6ec0 100644 --- a/toonz/sources/toonzlib/studiopalettecmd.cpp +++ b/toonz/sources/toonzlib/studiopalettecmd.cpp @@ -19,7 +19,7 @@ #include "toonz/sceneproperties.h" #include "toonz/toonzfolders.h" #include "toonz/txsheet.h" -#include +#include #include "historytypes.h" diff --git a/toonz/sources/toonzlib/tlog.cpp b/toonz/sources/toonzlib/tlog.cpp index 47566319..64204d1c 100644 --- a/toonz/sources/toonzlib/tlog.cpp +++ b/toonz/sources/toonzlib/tlog.cpp @@ -4,7 +4,7 @@ //#include "tfilepath.h" #include "tfilepath_io.h" -#include +#include #ifdef WIN32 #pragma warning(disable : 4996) diff --git a/toonz/sources/toonzlib/trastercentroid.cpp b/toonz/sources/toonzlib/trastercentroid.cpp index 8d050198..7110b4e6 100644 --- 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 diff --git a/toonz/sources/toonzqt/functionviewer.cpp b/toonz/sources/toonzqt/functionviewer.cpp index a25a806c..1c449967 100644 --- a/toonz/sources/toonzqt/functionviewer.cpp +++ b/toonz/sources/toonzqt/functionviewer.cpp @@ -18,7 +18,7 @@ #include "toonz/txsheethandle.h" #include "toonz/tobjecthandle.h" #include "toonz/tfxhandle.h" -#include "toonz/tcolumnHandle.h" +#include "toonz/tcolumnhandle.h" #include "toonz/fxdag.h" #include "toonz/txshzeraryfxcolumn.h" #include "toonz/tcolumnfx.h" @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include using namespace DVGui; diff --git a/toonz/sources/toonzqt/schematicviewer.cpp b/toonz/sources/toonzqt/schematicviewer.cpp index 0626838c..8fd0fd00 100644 --- a/toonz/sources/toonzqt/schematicviewer.cpp +++ b/toonz/sources/toonzqt/schematicviewer.cpp @@ -31,7 +31,7 @@ // Qt includes #include #include -#include +#include #include #include #include diff --git a/toonz/sources/toonzqt/spreadsheetviewer.cpp b/toonz/sources/toonzqt/spreadsheetviewer.cpp index 28ba0fa1..7a9a4c11 100644 --- a/toonz/sources/toonzqt/spreadsheetviewer.cpp +++ b/toonz/sources/toonzqt/spreadsheetviewer.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include