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/makesdna | |
| 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/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_sdna_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/intern/Makefile | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_sdna_types.h b/source/blender/makesdna/DNA_sdna_types.h index cdc0c33fb42..8553a3868d1 100644 --- a/source/blender/makesdna/DNA_sdna_types.h +++ b/source/blender/makesdna/DNA_sdna_types.h @@ -70,7 +70,7 @@ typedef struct BHead4 { # typedef struct BHead8 { int code, len; -#ifdef WIN32 +#if defined(WIN32) && !defined(FREE_WINDOWS) /* This is a compiler type! */ __int64 old; #else diff --git a/source/blender/makesdna/intern/Makefile b/source/blender/makesdna/intern/Makefile index d6a762156ca..84d854064d7 100644 --- a/source/blender/makesdna/intern/Makefile +++ b/source/blender/makesdna/intern/Makefile @@ -54,10 +54,14 @@ ifeq ($(OS),windows) # _really_ needed, but it is the easiest fix for now. If you have # some spare time, try to trace down the exact dep. Then again, you # could also spend that time making the sdna system more robust. - WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib - WINLIBS += advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib - WINLIBS += winmm.lib opengl32.lib glu32.lib largeint.lib - WINLIBS += /link /nodefaultlib:libc + ifneq ($(FREE_WINDOWS),true) + WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib + WINLIBS += advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib + WINLIBS += winmm.lib opengl32.lib glu32.lib largeint.lib + WINLIBS += /link /nodefaultlib:libc + else + LDFLAGS += -mwindows -mno-cygwin + endif endif clean:: |