diff options
| author | Chris Want <cwant@ualberta.ca> | 2003-05-25 09:22:46 +0400 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2003-05-25 09:22:46 +0400 |
| commit | fcad2744d7a10ac11ef18ca0abed237cdda34bba (patch) | |
| tree | 6e50abfe39c1ee34865dc8e1ad5842258bb7506b /intern | |
| parent | 6e6a73f38e39c84f4a2da983169957437bbe11a5 (diff) | |
Some tweaks to make the windows-gcc play nice with irix.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/python/freeze/Makefile | 8 | ||||
| -rw-r--r-- | intern/python/freeze/makemakefile.py | 18 |
2 files changed, 9 insertions, 17 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) |