From 924a8497551be7d83bb577e94ebf89b18374b874 Mon Sep 17 00:00:00 2001
From: Chris Want <cwant@ualberta.ca>
Date: Sat, 24 May 2003 20:04:37 +0000
Subject: 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.
---
 source/nan_link.mk | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'source/nan_link.mk')

diff --git a/source/nan_link.mk b/source/nan_link.mk
index 1006bf6d9dd..88d2c12ebd8 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -59,7 +59,7 @@ ifeq ($(OS),darwin)
     LLIBS    += -lGLU -lGL
     LLIBS    += -lz -framework Carbon -framework AGL
     ifeq ($(WITH_QUICKTIME), true)
-        LLIBS += -framework QuickTime
+		LLIBS += -framework QuickTime
     endif
     LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries
     DBG_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries
@@ -124,19 +124,26 @@ endif
 ifeq ($(OS),windows)
     EXT = .exe
 	SOEXT = .dll
-    DADD = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
-    DADD += advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
-    DADD += vfw32.lib winmm.lib opengl32.lib glu32.lib largeint.lib dxguid.lib
-    DADD += libcmt.lib
-    LOPTS = /link
-    LOPTS += /NODEFAULTLIB:"libc" 
-    LOPTS += /NODEFAULTLIB:"libcd" 
-    LOPTS += /NODEFAULTLIB:"libcp" 
-    LOPTS += /NODEFAULTLIB:"libcpd" 
-    LOPTS += /NODEFAULTLIB:"python20" 
-    LOPTS += /NODEFAULTLIB:"msvcrt" 
-    LOPTS += /SUBSYSTEM:CONSOLE
-    LDFLAGS += /MT
-    DYNLDFLAGS = /LD
+	ifeq ($(FREE_WINDOWS),true)
+		MINGWLIB = /usr/lib/w32api
+		LDFLAGS += -mwindows -mno-cygwin -mconsole
+		DADD += -L/usr/lib/w32api -lnetapi32 -lopengl32 -lglu32
+		DADD += -L/usr/lib/w32api 
+    else
+	    DADD = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
+		DADD += advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
+	    DADD += vfw32.lib winmm.lib opengl32.lib glu32.lib largeint.lib dxguid.lib
+		DADD += libcmt.lib
+		LOPTS = /link
+		LOPTS += /NODEFAULTLIB:"libc" 
+		LOPTS += /NODEFAULTLIB:"libcd" 
+		LOPTS += /NODEFAULTLIB:"libcp" 
+		LOPTS += /NODEFAULTLIB:"libcpd" 
+		LOPTS += /NODEFAULTLIB:"python20" 
+		LOPTS += /NODEFAULTLIB:"msvcrt" 
+		LOPTS += /SUBSYSTEM:CONSOLE
+		LDFLAGS += /MT
+		DYNLDFLAGS = /LD
+	endif
 endif
 
-- 
cgit v1.2.3