[Python-checkins] CVS: distutils/distutils bcppcompiler.py,1.5,1.6

[Greg Ward]

Update of /cvsroot/python/distutils/distutils
In directory slayer.i.sourceforge.net:/tmp/cvs-serv16972/distutils

Modified Files:
	bcppcompiler.py 
Log Message:
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


Index: bcppcompiler.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/bcppcompiler.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** bcppcompiler.py	2000/08/13 00:54:39	1.5
--- bcppcompiler.py	2000/09/01 01:28:33	1.6
***************
*** 225,239 ****
                  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)
--- 225,228 ----
***************
*** 247,250 ****
--- 236,250 ----
                           "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.
  
***************
*** 378,384 ****
          if debug:
              dlib = (lib + "_d")
!             try_names = ("bcpp_" + dlib, "bcpp_" + lib, dlib, lib)
          else:
!             try_names = ("bcpp_" + lib, lib)
  
          for dir in dirs:
--- 378,384 ----
          if debug:
              dlib = (lib + "_d")
!             try_names = (dlib + "_bcpp", lib + "_bcpp", dlib, lib)
          else:
!             try_names = (lib + "_bcpp", lib)
  
          for dir in dirs: