diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-05 02:04:15 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-05 02:04:15 +0300 |
| commit | beea73b110a7b3ad983a09c7e41b503cee590ebd (patch) | |
| tree | d7fcd15db02d97e9c2a665fd8ecc0e99b734bfb9 /extern/libredcode | |
| parent | 2d802627596ba51a2ff7ff56f28c0c14aee559ad (diff) | |
* 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.
Diffstat (limited to 'extern/libredcode')
| -rw-r--r-- | extern/libredcode/SConscript | 14 | ||||
| -rw-r--r-- | extern/libredcode/format.c | 5 |
2 files changed, 6 insertions, 13 deletions
diff --git a/extern/libredcode/SConscript b/extern/libredcode/SConscript index 4e83ba5cbb4..b58e6d5fe25 100644 --- a/extern/libredcode/SConscript +++ b/extern/libredcode/SConscript @@ -9,20 +9,8 @@ Import('env') 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 = []) diff --git a/extern/libredcode/format.c b/extern/libredcode/format.c index 35410e9e269..4677c49b8a5 100644 --- a/extern/libredcode/format.c +++ b/extern/libredcode/format.c @@ -1,4 +1,9 @@ +#ifdef _WIN32 +#include <Winsock2.h> +#else #include <netinet/in.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <string.h> |