Some tweaks to make the windows-gcc play nice with irix.

3 files changed, 49 insertions, 61 deletions

diff --git a/intern/python/freeze/Makefile b/intern/python/freeze/Makefile
index 893f6493a11..3f4f0fed112 100644
--- a/intern/python/freeze/Makefile
+++ b/intern/python/freeze/Makefile
@@ -22,15 +22,7 @@ all debug: default
 install: importer
 
 importer: 
-ifeq ($(FREE_WINDOWS),true)
-	cp $(NAN_PYTHON)/lib/python22.dll .
-	dlltool.exe -v --output-lib $(NAN_PYTHON)/lib/freepy.a \
-		--input-def $(NANBLENDERHOME)/dlltool/python.def \
-		--dllname python22.dll
-	ranlib $(NAN_PYTHON)/lib/freepy.a
-	rm ./python22.dll
 	@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR)
-endif
 	$(NAN_PYTHON_BINARY) $(PYFLAGS) freeze.py -d -x os -x pprint -x string -x copy -I $(SRCDIR) -o $(TARGETDIR) $(SRCDIR)/VRMLmain.py 
 	$(MAKE) -C $(TARGETDIR)
 
diff --git a/intern/python/freeze/makemakefile.py b/intern/python/freeze/makemakefile.py
index c13689304b7..6ad15207af8 100644
--- a/intern/python/freeze/makemakefile.py
+++ b/intern/python/freeze/makemakefile.py
@@ -25,15 +25,15 @@ def makemakefile(outfp, makevars, files, target):
 	for key in keys:
 		outfp.write("%s=%s\n" % (key, makevars[key]))
 
-		outfp.write("\n\ninclude nan_definitions.mk\n")
-		outfp.write("ifeq ($(OS),windows)\n")
-		outfp.write("  CFLAGS=-I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) $(OPT)\n")
-		outfp.write("  ifneq ($(FREE_WINDOWS),true)\n")
-		outfp.write("  	 CC=$(NANBLENDERHOME)/source/tools/cygwin/cl_wrapper.pl\n")
-		outfp.write("  else\n")
-		outfp.write("    CFLAGS += -mwindows -mno-cygwin\n")
-		outfp.write("  endif\n")
-		outfp.write("endif\n")
+	outfp.write("\n\ninclude nan_definitions.mk\n")
+	outfp.write("ifeq ($(OS),windows)\n")
+	outfp.write("  CFLAGS=-I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) $(OPT)\n")
+	outfp.write("  ifneq ($(FREE_WINDOWS),true)\n")
+	outfp.write("  	 CC=$(NANBLENDERHOME)/source/tools/cygwin/cl_wrapper.pl\n")
+	outfp.write("  else\n")
+	outfp.write("    CFLAGS += -mwindows -mno-cygwin\n")
+	outfp.write("  endif\n")
+	outfp.write("endif\n")
 
 	outfp.write("\nall: %s\n\n" % libtarget)
 
diff --git a/source/nan_compile.mk b/source/nan_compile.mk
index f023d43402e..41d722d000f 100644
--- a/source/nan_compile.mk
+++ b/source/nan_compile.mk
@@ -174,47 +174,46 @@ ifeq ($(OS),solaris)
 endif
 
 ifeq ($(OS),windows)
-	ifeq ($(FREE_WINDOWS),true)
-		CC  = gcc
-		CCC = g++
-		CFLAGS += -pipe -mno-cygwin -mwindows
-		CCFLAGS += -pipe -mno-cygwin -mwindows
-		CPPFLAGS += -DFREE_WINDOWS
-		#CPPFLAGS += -I/usr/include/mingw
-		REL_CFLAGS += -O2
-		REL_CCFLAGS += -O2
-		#NAN_DEPEND = true
-		#OPENGL_HEADERS = /usr/include/w32api
-		OPENGL_HEADERS = ./
-		AR = ar
-		ARFLAGS = ruv
-		ARFLAGSQUIET = ru
-		WINRC = $(wildcard *.rc)	
-		RANLIB = ranlib
-	else
-	    CC	= $(SRCHOME)/tools/cygwin/cl_wrapper.pl
-		CCC = $(SRCHOME)/tools/cygwin/cl_wrapper.pl
-	    JAVAC = $(SRCHOME)/tools/cygwin/java_wrapper.pl -c
-	    JAVAH = $(SRCHOME)/tools/cygwin/java_wrapper.pl -h
-		REL_CFLAGS	+= /O2
-	    REL_CCFLAGS += /O2 -GX
-		DBG_CFLAGS	+= /Fd$(DIR)/debug/
-		DBG_CCFLAGS += /Fd$(DIR)/debug/
-		CFLAGS += /MT
-		CCFLAGS += /MT
-		NAN_DEPEND = true
-		OPENGL_HEADERS = .
-		CPPFLAGS += -DWIN32 -D_WIN32 -D__WIN32
-		CPPFLAGS += -D_M_IX86
-		CPPFLAGS += -I"/cygdrive/c/Program Files/Microsoft Visual Studio/VC98/include"
-		JAVA_HEADERS = /cygdrive/c/j2sdk1.4.0-beta3/include
-		JAVA_SYSTEM_HEADERS = /cygdrive/c/j2sdk1.4.0-beta3/include/win32
-		CPP = $(SRCHOME)/tools/cygwin/cl_wrapper.pl
-		AR = ar
-		ARFLAGS = ruv
-		ARFLAGSQUIET = ru
-		WINRC = $(wildcard *.rc)
-	endif
+  ifeq ($(FREE_WINDOWS),true)
+    CC  = gcc
+    CCC = g++
+    CFLAGS += -pipe -mno-cygwin -mwindows
+    CCFLAGS += -pipe -mno-cygwin -mwindows
+    CPPFLAGS += -DFREE_WINDOWS
+    REL_CFLAGS += -O2
+    REL_CCFLAGS += -O2
+    #NAN_DEPEND = true
+    #OPENGL_HEADERS = /usr/include/w32api
+    OPENGL_HEADERS = ./
+    AR = ar
+    ARFLAGS = ruv
+    ARFLAGSQUIET = ru
+    WINRC = $(wildcard *.rc)	
+    RANLIB = ranlib
+  else
+    CC	= $(SRCHOME)/tools/cygwin/cl_wrapper.pl
+    CCC = $(SRCHOME)/tools/cygwin/cl_wrapper.pl
+    JAVAC = $(SRCHOME)/tools/cygwin/java_wrapper.pl -c
+    JAVAH = $(SRCHOME)/tools/cygwin/java_wrapper.pl -h
+    REL_CFLAGS	+= /O2
+    REL_CCFLAGS += /O2 -GX
+    DBG_CFLAGS	+= /Fd$(DIR)/debug/
+    DBG_CCFLAGS += /Fd$(DIR)/debug/
+    CFLAGS += /MT
+    CCFLAGS += /MT
+    NAN_DEPEND = true
+    OPENGL_HEADERS = .
+    CPPFLAGS += -DWIN32 -D_WIN32 -D__WIN32
+    CPPFLAGS += -D_M_IX86
+    CPPFLAGS += -I"/cygdrive/c/Program Files/Microsoft Visual Studio/VC98/include"
+    JAVA_HEADERS = /cygdrive/c/j2sdk1.4.0-beta3/include
+    JAVA_SYSTEM_HEADERS = /cygdrive/c/j2sdk1.4.0-beta3/include/win32
+    CPP = $(SRCHOME)/tools/cygwin/cl_wrapper.pl
+    AR = ar
+    ARFLAGS = ruv
+    ARFLAGSQUIET = ru
+    WINRC = $(wildcard *.rc)
+  endif
 endif
 
 ifeq (debug, $(findstring debug, $(MAKECMDGOALS)))
@@ -264,9 +263,6 @@ $(DIR)/$(DEBUG_DIR)%.o: %.cpp
 	$(CCC) -c $(CCFLAGS) $(CPPFLAGS) $< -o $@
     endif
 
-#$(DIR)/$(DEBUG_DIR)%.res: %.rc
-#	$(SRCHOME)/tools/cygwin/cl_wrapper.pl - rc /fo$@ $<
-
 $(DIR)/$(DEBUG_DIR)%.res: %.rc
 ifeq ($(FREE_WINDOWS),true)
 	windres $< -O coff -o $@