diff options
| author | Andrea Weikert <elubie@gmx.net> | 2007-09-23 17:52:08 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2007-09-23 17:52:08 +0400 |
| commit | 70edf4e2933f9a402de70298352b8775540baf15 (patch) | |
| tree | 779e302a80ce55c37cc071adbda8572fe6ce259f | |
| parent | 5f648881377c13d337c2c648e5747bc66ce92cf2 (diff) | |
fixing some compile problems with MSVC7.1/scons
* stupid misplacement of declaration
* replacing fmodf with fmod (fmodf not available with MSVC7.1 when compiling C-code)
* appending CXXFLAGS to CCFLAGS in tools/Blender.py to avoid linking errors with runtime library (/MT not set)
- jesterKing, could you please check if that's ok?
| -rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/rayshade.c | 4 | ||||
| -rw-r--r-- | tools/Blender.py | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index 5e6335cdac1..493b0968f55 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -195,9 +195,9 @@ static int uri_from_filename( const char *dir, const char *file, char *uri ) #ifdef WITH_ICONV { + char uri_utf8[FILE_MAX*3+8]; escape_uri_string(orig_uri, uri_utf8, FILE_MAX*3+8, UNSAFE_PATH); BLI_string_to_utf8(uri_utf8, uri, NULL); - char uri_utf8[FILE_MAX*3+8]; } #else escape_uri_string(orig_uri, uri, FILE_MAX*3+8, UNSAFE_PATH); diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c index 03f5fb03fea..ffae43945bb 100644 --- a/source/blender/render/intern/source/rayshade.c +++ b/source/blender/render/intern/source/rayshade.c @@ -736,8 +736,8 @@ static void QMC_freeSampler(QMCSampler *qsa) static void QMC_getSample(double *s, QMCSampler *qsa, int thread, int num) { if (qsa->type == SAMP_TYPE_HAMMERSLEY) { - s[0] = fmodf(qsa->samp2d[2*num+0] + qsa->offs[thread][0], 1.0f); - s[1] = fmodf(qsa->samp2d[2*num+1] + qsa->offs[thread][1], 1.0f); + s[0] = fmod(qsa->samp2d[2*num+0] + qsa->offs[thread][0], 1.0f); + s[1] = fmod(qsa->samp2d[2*num+1] + qsa->offs[thread][1], 1.0f); } else { /* SAMP_TYPE_HALTON */ s[0] = qsa->samp2d[2*num+0]; diff --git a/tools/Blender.py b/tools/Blender.py index 601d3c3000d..a3452f4d593 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -391,12 +391,13 @@ class BlenderEnvironment(SConsEnvironment): # debug or not # CXXFLAGS defaults to CCFLAGS, therefore # we Replace() rather than Append() to CXXFLAGS the first time + lenv.Replace(CXXFLAGS = lenv['CCFLAGS']) if lenv['BF_DEBUG'] or (libname in quickdebug): lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_FLAGS'])) - lenv.Replace( CXXFLAGS = Split(lenv['BF_DEBUG_FLAGS'])) + lenv.Append( CXXFLAGS = Split(lenv['BF_DEBUG_FLAGS'])) else: lenv.Append(CCFLAGS = lenv['REL_CFLAGS']) - lenv.Replace(CXXFLAGS = lenv['REL_CCFLAGS']) + lenv.Append(CXXFLAGS = lenv['REL_CCFLAGS']) if lenv['BF_PROFILE']: lenv.Append(CCFLAGS = Split(lenv['BF_PROFILE_FLAGS']), CXXFLAGS = Split(lenv['BF_PROFILE_FLAGS'])) |