mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updates for Fedora Core 20

metadata
Wenzel Jakob 2014-02-27 06:05:20 -05:00
parent e8e8aba757
commit 5fc6286107
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/linux/fedora/mitsuba.spec
View File

@ -24,7 +24,7 @@ building custom plugins and other extensions for Mitsuba.
%prep %prep
%setup -q %setup -q
%build %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 scons
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT

5
src/converter/SConscript
View File

@ -7,10 +7,7 @@ if hasCollada:
import platform import platform
colladaEnv = mainEnv.Clone() colladaEnv = mainEnv.Clone()
if platform.linux_distribution()[0] == 'Fedora': colladaEnv.Prepend(CXXFLAGS=['-DCOLLADA_DOM_2_4'])
pass # Use old COLLADA-DOM 2.3
else: # Everyone else uses 2.4
colladaEnv.Prepend(CXXFLAGS=['-DCOLLADA_DOM_2_4'])
# Build the COLLADA importer if COLLADA-DOM is vailable # Build the COLLADA importer if COLLADA-DOM is vailable
colladaEnv.Append(LIBS=['mitsuba-hw']) colladaEnv.Append(LIBS=['mitsuba-hw'])