diff --git a/data/linux/fedora/mitsuba.spec b/data/linux/fedora/mitsuba.spec index 1ba91326..c0b1c115 100644 --- a/data/linux/fedora/mitsuba.spec +++ b/data/linux/fedora/mitsuba.spec @@ -24,7 +24,7 @@ building custom plugins and other extensions for Mitsuba. %prep %setup -q %build -cat build/config-linux-gcc.py | sed -e "s/\(boost_[^']*\)/\1-mt/g" > config.py +cat build/config-linux-gcc.py | sed -e "s/collada14dom/libcollada-dom2.4-dp/g" | sed -e "s/include\/collada-dom/include\/collada-dom2.4/g" > config.py scons %install rm -rf $RPM_BUILD_ROOT diff --git a/src/converter/SConscript b/src/converter/SConscript index d1a49ad5..2a49aa49 100644 --- a/src/converter/SConscript +++ b/src/converter/SConscript @@ -7,10 +7,7 @@ if hasCollada: import platform colladaEnv = mainEnv.Clone() - if platform.linux_distribution()[0] == 'Fedora': - pass # Use old COLLADA-DOM 2.3 - else: # Everyone else uses 2.4 - colladaEnv.Prepend(CXXFLAGS=['-DCOLLADA_DOM_2_4']) + colladaEnv.Prepend(CXXFLAGS=['-DCOLLADA_DOM_2_4']) # Build the COLLADA importer if COLLADA-DOM is vailable colladaEnv.Append(LIBS=['mitsuba-hw'])