Rene Liebscher:
* reverse library names from bcpp_library to library_bcpp
* move some code to the right places, to put the def-files
in the right directories again
diff --git a/Lib/distutils/bcppcompiler.py b/Lib/distutils/bcppcompiler.py
index 8ad9e4f..2b73b12 100644
--- a/Lib/distutils/bcppcompiler.py
+++ b/Lib/distutils/bcppcompiler.py
@@ -224,17 +224,6 @@
else:
ld_args = self.ldflags_shared[:]
- # Borland C++ has problems with '/' in paths
- objects = map(os.path.normpath, objects)
- startup_obj = 'c0d32'
- objects.insert(0, startup_obj)
-
- # either exchange python15.lib in the python libs directory against
- # a Borland-like one, or create one with name bcpp_python15.lib
- # there and remove the pragmas from config.h
- libraries.append ('import32')
- libraries.append ('cw32mt')
-
# Create a temporary exports file for use by the linker
head, tail = os.path.split (output_filename)
modname, ext = os.path.splitext (tail)
@@ -246,6 +235,17 @@
self.execute(write_file, (def_file, contents),
"writing %s" % def_file)
+ # Borland C++ has problems with '/' in paths
+ objects = map(os.path.normpath, objects)
+ startup_obj = 'c0d32'
+ objects.insert(0, startup_obj)
+
+ # either exchange python15.lib in the python libs directory against
+ # a Borland-like one, or create one with name bcpp_python15.lib
+ # there and remove the pragmas from config.h
+ libraries.append ('import32')
+ libraries.append ('cw32mt')
+
# Start building command line flags and options.
for l in library_dirs:
@@ -377,9 +377,9 @@
# seems to have a different format for static libraries.
if debug:
dlib = (lib + "_d")
- try_names = ("bcpp_" + dlib, "bcpp_" + lib, dlib, lib)
+ try_names = (dlib + "_bcpp", lib + "_bcpp", dlib, lib)
else:
- try_names = ("bcpp_" + lib, lib)
+ try_names = (lib + "_bcpp", lib)
for dir in dirs:
for name in try_names: