fixing some compile problems with MSVC7.1/scons
authorAndrea Weikert <elubie@gmx.net>
Sun, 23 Sep 2007 13:52:08 +0000 (13:52 +0000)
committerAndrea Weikert <elubie@gmx.net>
Sun, 23 Sep 2007 13:52:08 +0000 (13:52 +0000)
* 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?

source/blender/imbuf/intern/thumbs.c
source/blender/render/intern/source/rayshade.c
tools/Blender.py

index 5e6335cdac18f3c993a68a227a69216695c91f47..493b0968f55bb63d02602ee72b1141ee456a494c 100644 (file)
@@ -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);
index 03f5fb03fea3009695fd719d949c32ad0cf6ef0a..ffae43945bb87634ba04b6e202130d35feb92ab9 100644 (file)
@@ -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];
index 601d3c3000dd19d093fc8a6d5fb9769f1be0618b..a3452f4d593cdd4e09c69d09e1d90be7afed7d53 100644 (file)
@@ -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']))