diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:22:22 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:22:22 +0000 |
| commit | efd7c363052cf301411dd298a2e7792c21f82047 (patch) | |
| tree | f5fd94e898fe94f496d8734cd7a4a6239b7bac17 /python | |
| parent | 8ebe62781b62ec36890c01a0cae92149a59d71e9 (diff) | |
INTEGRATION: CWS obo05 (1.23.16); FILE MERGED
2006/08/09 13:14:07 obo 1.23.16.2: RESYNC: (1.23-1.24); FILE MERGED
2006/07/03 08:13:33 obo 1.23.16.1: #i53611# .net 2005
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index 913f4e5f7392..8e2240edbd14 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # -# last change: $Author: kz $ $Date: 2006-07-19 09:37:08 $ +# last change: $Author: vg $ $Date: 2006-09-25 13:22:22 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -121,12 +121,18 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; c PYTHONPATH:=..$/Lib .EXPORT : PYTHONPATH +.IF "$(CCNUMVER)" <= "001400000000" +EXFLAGS="/GX /YX" +.ELSE +EXFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" +.ENDIF + BUILD_DIR=PCbuild # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native BUILD_ACTION= \ - $(foreach,i,$(PYPROJECTS) nmake /e /f $(i).mak CFG="$(i) - Win32 Release" OS="Windows_NT" && ) \ + $(foreach,i,$(PYPROJECTS) nmake /f $(i).mak CFG="$(i) - Win32 Release" EXFLAGS=$(EXFLAGS) && ) \ python.exe -c "import os" && \ echo build done .ENDIF @@ -170,4 +176,3 @@ $(MISC)$/%.unpack : $(PRJ)$/download$/%.tar.bz2 @+echo $(assign UNPACKCMD := bzip2 -cd $(BACK_PATH)download$/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | tar $(TAR_EXCLUDE_SWITCH) -xvf - ) > $(NULLDEV) .ENDIF # "$(GUI)"=="UNX" @+$(COPY) $(mktmp $(UNPACKCMD)) $@ - |