diff options
author | Chris Want <cwant@ualberta.ca> | 2003-05-25 00:04:37 +0400 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2003-05-25 00:04:37 +0400 |
commit | 924a8497551be7d83bb577e94ebf89b18374b874 (patch) | |
tree | 5912852343da88dcc863a56ab641e60983a5432b /source/blender/blenloader/intern | |
parent | 94c4250d9f7ca57d9af7a7265fcdec0b4e94e5b3 (diff) |
Support for building bf-blender under windows with gcc (huge thanks to
Florian Eggenburger).
Full instructions are in doc/README.windows-gcc.
Main differences from Florian's patch:
- the 'lib' dir should now be the same level as the 'blender' dir (rather
than being a subdir of 'blender'). This is consistent with the other
platforms that bf-blender supports (tuhopuu will also adopt this convention
hopefully soon).
- the script 'free_windows-env.mk' is no longer needed ... see the
docs about how this is overcome (again, tuhopuu will hopefully
also follow this route soon).
- the dlltool dir has it's own Makefile that builds all of the
needed stub libraries from the dll's in cvs.
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r-- | source/blender/blenloader/intern/genfile.c | 3 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/genfile.c b/source/blender/blenloader/intern/genfile.c index f985879de32..ea7f6dc2985 100644 --- a/source/blender/blenloader/intern/genfile.c +++ b/source/blender/blenloader/intern/genfile.c @@ -61,6 +61,9 @@ #include "genfile.h" +#ifdef FREE_WINDOWS +typedef long long __int64; +#endif /* * - please note: no builtin security to detect input of double structs diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 609b99b9f15..5b5632401ba 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -498,7 +498,7 @@ static void switch_endian_bh8(BHead8 *bhead) static void bh4_from_bh8(BHead *bhead, BHead8 *bhead8, int do_endian_swap) { BHead4 *bhead4 = (BHead4 *) bhead; -#ifdef WIN32 +#if defined(WIN32) && !defined(FREE_WINDOWS) __int64 old; #else long long old; @@ -1052,7 +1052,7 @@ static void link_glob_list(FileData *fd, ListBase *lb) /* for glob data */ static void test_pointer_array(FileData *fd, void **mat) { -#ifdef WIN32 +#if defined(WIN32) && !defined(FREE_WINDOWS) __int64 *lpoin, *lmat; #else long long *lpoin, *lmat; |