diff --git a/toonz/sources/image/CMakeLists.txt b/toonz/sources/image/CMakeLists.txt index 2bac510..f73ec7d 100644 --- a/toonz/sources/image/CMakeLists.txt +++ b/toonz/sources/image/CMakeLists.txt @@ -85,7 +85,11 @@ if(WIN32) endif() endif() -_find_toonz_library(TNZLIBS "tnzcore;tnzbase;toonzlib") +if(PLATFORM EQUAL 32) + _find_toonz_library(TNZLIBS "tnzcore;tnzbase") +else() + _find_toonz_library(TNZLIBS "tnzcore;tnzbase;toonzlib") +endif() if(WIN32) set(EXTRA_LIBS diff --git a/toonz/sources/image/psd/tiio_psd.cpp b/toonz/sources/image/psd/tiio_psd.cpp index 3521f8a..1d0e064 100644 --- a/toonz/sources/image/psd/tiio_psd.cpp +++ b/toonz/sources/image/psd/tiio_psd.cpp @@ -1,9 +1,10 @@ #include "tiio_psd.h" #include "trasterimage.h" #include "timageinfo.h" +#if (defined(x64) || defined(__LP64__)) #include "toonz/preferences.h" - #include +#endif // forward declaration //class TImageReaderLayerPsd; @@ -39,12 +40,15 @@ TLevelReaderPsd::TLevelReaderPsd(const TFilePath &path) const QString &layerStr = list.at(1); #ifdef REF_LAYER_BY_NAME + #if (defined(x64) || defined(__LP64__)) if (layerStr != "frames") { QTextCodec* layerNameCodec = QTextCodec::codecForName( Preferences::instance()->getLayerNameEncoding().c_str() ); TPSDParser psdparser(m_path); m_layerId = psdparser.getLevelIdByName(layerNameCodec->fromUnicode(layerStr).toStdString()); - } else + } else { m_layerId = layerStr.toInt(); + } + #endif #else m_layerId = layerName.toInt(); #endif