[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17327] trunk/blender: * enable openjpeg building for win32/msvc

[Nathan Letwory]

Revision: 17327
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17327
Author:   jesterking
Date:     2008-11-05 00:04:15 +0100 (Wed, 05 Nov 2008)

Log Message:
-----------
* enable openjpeg building for win32/msvc
* add support for building redcode on win32/msvc, but disabled for now, as there are linking problems
  - I cleaned the redcode sconscript - the copying of headers within the source tree is not a clean solution
    This needs to be fixed later on. For now, lets use redcode from extern/ until a better way is found.

Modified Paths:
--------------
    trunk/blender/config/win32-vc-config.py
    trunk/blender/extern/libopenjpeg/SConscript
    trunk/blender/extern/libredcode/SConscript
    trunk/blender/extern/libredcode/format.c
    trunk/blender/source/blender/imbuf/intern/IMB_anim.h
    trunk/blender/source/blender/imbuf/intern/anim.c

Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py	2008-11-04 22:48:46 UTC (rev 17326)
+++ trunk/blender/config/win32-vc-config.py	2008-11-04 23:04:15 UTC (rev 17327)
@@ -150,6 +150,11 @@
 BF_QUICKTIME_LIB = 'qtmlClient'
 BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
 
+WITH_BF_OPENJPEG = True 
+
+WITH_BF_REDCODE = False  
+BF_REDCODE_INC = '#extern'
+
 WITH_BF_STATICOPENGL = False
 BF_OPENGL_INC = '${BF_OPENGL}/include'
 BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'

Modified: trunk/blender/extern/libopenjpeg/SConscript
===================================================================
--- trunk/blender/extern/libopenjpeg/SConscript	2008-11-04 22:48:46 UTC (rev 17326)
+++ trunk/blender/extern/libopenjpeg/SConscript	2008-11-04 23:04:15 UTC (rev 17327)
@@ -7,14 +7,18 @@
 sources = env.Glob('*.c')
 incs = '.'
 
-flags = "-Wall -O3 -ffast-math -std=c99"
+if env['OURPLATFORM'] == 'win32-vc':
+	flags = []
+else:
+	flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
 
-oj_env = env.Copy();
-oj_env.Replace(CCFLAGS = '')
-oj_env.Replace(BF_DEBUG_FLAGS = '')
+oj_env = env.Clone()
+if not env['OURPLATFORM'] == 'win32-vc':
+	oj_env.Replace(CCFLAGS = '')
+	oj_env.Replace(BF_DEBUG_FLAGS = '')
 
 oj_env.BlenderLib ( libname='extern_openjpeg', 
                     sources=sources, includes=Split(incs),
                     defines=[],
                     libtype=['core','intern','player'],
-                    priority=[10, 10, 300], compileflags = Split(flags))
+                    priority=[5, 10, 200], compileflags = flags)

Modified: trunk/blender/extern/libredcode/SConscript
===================================================================
--- trunk/blender/extern/libredcode/SConscript	2008-11-04 22:48:46 UTC (rev 17326)
+++ trunk/blender/extern/libredcode/SConscript	2008-11-04 23:04:15 UTC (rev 17327)
@@ -9,20 +9,8 @@
 sources = env.Glob('*.c')
 incs = '. ../libopenjpeg'
 
-root = "extern/libredcode"
-
-if not os.path.isdir(root + "/include"):
-    os.mkdir(root + "/include");
-if not os.path.isdir(root + "/include/redcode"):
-    os.mkdir(root + "/include/redcode");
-
-for h in env.Glob('*.h'):
-    shutil.copyfile(root + "/" + h,
-                    root + "/include/redcode/" + h)
-
-
 env.BlenderLib ( libname='extern_redcode', 
                  sources=sources, includes=Split(incs),
                  defines=[],
                  libtype=['core','intern','player'],
-                 priority=[5, 5, 200], compileflags = [])
+                 priority=[10, 5, 300], compileflags = [])

Modified: trunk/blender/extern/libredcode/format.c
===================================================================
--- trunk/blender/extern/libredcode/format.c	2008-11-04 22:48:46 UTC (rev 17326)
+++ trunk/blender/extern/libredcode/format.c	2008-11-04 23:04:15 UTC (rev 17327)
@@ -1,4 +1,9 @@
+#ifdef _WIN32
+#include <Winsock2.h>
+#else
 #include <netinet/in.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/blender/source/blender/imbuf/intern/IMB_anim.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/IMB_anim.h	2008-11-04 22:48:46 UTC (rev 17326)
+++ trunk/blender/source/blender/imbuf/intern/IMB_anim.h	2008-11-04 23:04:15 UTC (rev 17327)
@@ -82,8 +82,12 @@
 #endif
 
 #ifdef WITH_REDCODE
-#include <redcode/format.h>
+#ifdef _WIN32 /* on windows we use the one in extern instead */
+#include "libredcode/format.h"
+#else
+#include "libredcode/format.h"
 #endif
+#endif
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"

Modified: trunk/blender/source/blender/imbuf/intern/anim.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim.c	2008-11-04 22:48:46 UTC (rev 17326)
+++ trunk/blender/source/blender/imbuf/intern/anim.c	2008-11-04 23:04:15 UTC (rev 17327)
@@ -97,9 +97,14 @@
 #endif
 
 #ifdef WITH_REDCODE
-#include <redcode/format.h>
-#include <redcode/codec.h>
+#ifdef _WIN32 /* on windows we use the ones in extern instead */
+#include "libredcode/format.h"
+#include "libredcode/codec.h"
+#else
+#include "libredcode/format.h"
+#include "libredcode/codec.h"
 #endif
+#endif
 
 /****/