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

Revert "added support to qt5" 

This reverts commit 9d07003e37.
master
Luca Quartesan 2022-01-06 18:57:38 +01:00
parent 4daeba3847
commit a4c0d518bf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/config-linux-gcc.py
View File

@ -4,7 +4,7 @@ BUILDDIR = '#build/release'
DISTDIR = '#dist' DISTDIR = '#dist'
CXX = 'g++' CXX = 'g++'
CC = 'gcc' CC = 'gcc'
CXXFLAGS = ['-O3', '-Wall', '-fPIC', '-std=c++11', '-g', '-pipe', '-march=nocona', '-msse2', '-ftree-vectorize', '-mfpmath=sse', '-funsafe-math-optimizations', '-fno-rounding-math', '-fno-signaling-nans', '-fno-math-errno', '-fomit-frame-pointer', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT', '-fopenmp', '-fvisibility=hidden', '-mtls-dialect=gnu2'] CXXFLAGS = ['-O3', '-Wall', '-g', '-pipe', '-march=nocona', '-msse2', '-ftree-vectorize', '-mfpmath=sse', '-funsafe-math-optimizations', '-fno-rounding-math', '-fno-signaling-nans', '-fno-math-errno', '-fomit-frame-pointer', '-DMTS_DEBUG', '-DSINGLE_PRECISION', '-DSPECTRUM_SAMPLES=3', '-DMTS_SSE', '-DMTS_HAS_COHERENT_RT', '-fopenmp', '-fvisibility=hidden', '-mtls-dialect=gnu2']
LINKFLAGS = [] LINKFLAGS = []
SHLINKFLAGS = ['-rdynamic', '-shared', '-fPIC', '-lstdc++'] SHLINKFLAGS = ['-rdynamic', '-shared', '-fPIC', '-lstdc++']
BASEINCLUDE = ['#include'] BASEINCLUDE = ['#include']

2
data/scons/qt5.py
View File

@ -438,7 +438,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")]) self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5")]) self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5")])
self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5",module)]) self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5",module)])
pcmodules = [module.replace('Qt','Qt5')+debugSuffix for module in modules if module not in pclessModules ] pcmodules = [module+debugSuffix for module in modules if module not in pclessModules ]
if 'QtDBus' in pcmodules: if 'QtDBus' in pcmodules:
self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5","QtDBus")]) self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5","QtDBus")])
if "QtAssistant" in pcmodules: if "QtAssistant" in pcmodules: