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 /intern/keymaker | |
| 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 'intern/keymaker')
| -rw-r--r-- | intern/keymaker/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/intern/keymaker/Makefile b/intern/keymaker/Makefile index 038dd85fc7e..703482a851b 100644 --- a/intern/keymaker/Makefile +++ b/intern/keymaker/Makefile @@ -51,8 +51,12 @@ LOADER_OBJS = $(DIR)/$(DEBUG_DIR)keyloader.o ifneq ($(OS),windows) LIBS = $(NAN_OPENSSL)/lib/libcrypto.a else - LIBS = $(NAN_OPENSSL)/lib/libeay32.lib - LIBS += advapi32.lib gdi32.lib + ifeq ($(FREE_WINDOWS),true) + LIBS = $(NAN_OPENSSL)/lib/libcrypto.a + else + LIBS = $(NAN_OPENSSL)/lib/libeay32.lib + LIBS += advapi32.lib gdi32.lib + endif endif all debug:: link |