diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2010-09-14 12:49:54 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 12:49:54 +0200 |
commit | b5b8138aac4308de952f0fbf2d56336205b20047 (patch) | |
tree | 3aab39e180dbffad9131e93691508f94389aef7c /python/makefile.mk | |
parent | cairo-cairo-makefile-mk.diff: Fix linking of internal cairo library (diff) | |
download | core-b5b8138aac4308de952f0fbf2d56336205b20047.tar.gz core-b5b8138aac4308de952f0fbf2d56336205b20047.zip |
python-win32-buildfix.diff: make python build properly on win32
Diffstat (limited to 'python/makefile.mk')
-rw-r--r-- | python/makefile.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index a35e596669a0..ddc386938e45 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -111,16 +111,20 @@ BUILD_ACTION=$(ENV_BUILD) make && make install #.ENDIF #"$(WINDOWS_VISTA_PSDK)"!="" #.ENDIF +.IF "$(CCNUMVER)" >= "001500000000" BUILD_DIR=PCbuild +.ELIF "$(CCNUMVER)" >= "001400000000" +BUILD_DIR=PC/VS8.0 +.ELIF "$(CCNUMVER)" >= "001310000000" +BUILD_DIR=PC/VS7.1 +.ELSE +BUILD_DIR=PC/VC6 +.ENDIF # 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 -.IF "$(SYSBASE)" != "" -BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|Win32" -.ELSE BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "Release|Win32" -.ENDIF # "$(SYSBASE)" != "" .ENDIF .ENDIF |