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

a few minor tweaks to get things to compile with XE Composer 2013

metadata
Wenzel Jakob 2012-09-27 17:19:57 -07:00
parent 35da602d4e
commit c1d9fd195f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/scons/icl12.py
View File

@ -111,7 +111,10 @@ def generate(env):
else: else:
raise Exception('Unknown version of visual studio!') raise Exception('Unknown version of visual studio!')
icpp_path = os.environ.get('ICPP_COMPOSER2011') if 'ICPP_COMPOSER2011' in os.environ:
icpp_path = os.environ.get('ICPP_COMPOSER2011')
else:
icpp_path = os.environ.get('ICPP_COMPILER13')
merge_script_vars(env, os.path.join(icpp_path, 'bin/iclvars.bat'), arch + ' ' + vsrelease) merge_script_vars(env, os.path.join(icpp_path, 'bin/iclvars.bat'), arch + ' ' + vsrelease)
env['REDIST_PATH'] = os.path.join(os.path.join(os.path.join(icpp_path, 'redist'), arch_redist), 'compiler') env['REDIST_PATH'] = os.path.join(os.path.join(os.path.join(icpp_path, 'redist'), arch_redist), 'compiler')

1
src/mtsgui/main.cpp
View File

@ -16,6 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <mitsuba/core/platform.h>
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtOpenGL/QGLFormat> #include <QtOpenGL/QGLFormat>
#include <mitsuba/core/shvector.h> #include <mitsuba/core/shvector.h>