diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:45:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 09:45:54 +0000 |
| commit | c6455cea36ccbdc87b65961aab1a9e5fbcab67c2 (patch) | |
| tree | 5c5c3ea9129c7a5a970ab37cd1c76e353ad145b3 /python | |
| parent | de55789e60e772b801dcf572c9ec2730c80ebaa1 (diff) | |
INTEGRATION: CWS obo12 (1.31.6); FILE MERGED
2007/05/24 15:27:07 obo 1.31.6.2: #i76713# corrected
2007/05/11 09:45:14 obo 1.31.6.1: #i76713# changes for Vista PSDK
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index 1962042e7b2c..ca812ad1cce4 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.32 $ +# $Revision: 1.33 $ # -# last change: $Author: vg $ $Date: 2007-05-25 11:01:49 $ +# last change: $Author: ihi $ $Date: 2007-06-05 10:45:54 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -140,15 +140,21 @@ PYTHONPATH:=..$/Lib .IF "$(CCNUMVER)" <= "001400000000" EXFLAGS="/GX /YX" .ELSE +.IF "$(WINDOWS_VISTA_PSDK)"!="" EXFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" +ADDITIONALLIBS=ws2_32.lib +.ELSE #"$(WINDOWS_VISTA_PSDK)"!="" +EXFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" +.ENDIF #"$(WINDOWS_VISTA_PSDK)"!="" .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 /f $(i).mak CFG="$(i) - Win32 Release" EXFLAGS=$(EXFLAGS) && ) \ + $(foreach,i,$(PYPROJECTS) nmake /f $(i).mak CFG="$(i) - Win32 Release" EXFLAGS=$(EXFLAGS) ADDITIONALLIBS=$(ADDITIONALLIBS) && ) \ python.exe -c "import os" && \ echo build done .ENDIF |