[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12113] trunk/blender: fixing some compile problems with MSVC7.1/scons

[Andrea Weikert]

Revision: 12113
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12113
Author:   elubie
Date:     2007-09-23 15:52:08 +0200 (Sun, 23 Sep 2007)

Log Message:
-----------
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?

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/thumbs.c
    trunk/blender/source/blender/render/intern/source/rayshade.c
    trunk/blender/tools/Blender.py

Modified: trunk/blender/source/blender/imbuf/intern/thumbs.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/thumbs.c	2007-09-23 13:00:35 UTC (rev 12112)
+++ trunk/blender/source/blender/imbuf/intern/thumbs.c	2007-09-23 13:52:08 UTC (rev 12113)
@@ -195,9 +195,9 @@
 	
 #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);

Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c	2007-09-23 13:00:35 UTC (rev 12112)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c	2007-09-23 13:52:08 UTC (rev 12113)
@@ -736,8 +736,8 @@
 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];

Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py	2007-09-23 13:00:35 UTC (rev 12112)
+++ trunk/blender/tools/Blender.py	2007-09-23 13:52:08 UTC (rev 12113)
@@ -391,12 +391,13 @@
             # 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']))