Browse Source

using DYNAMIC_LIB_EXT

Dave Schuyler 21 years ago
parent
commit
1f9214cb44
3 changed files with 16 additions and 6 deletions
  1. 5 0
      dtool/Config.Linux.pp
  2. 5 0
      dtool/Config.Win32.pp
  3. 6 6
      dtool/pptempl/Template.unix.pp

+ 5 - 0
dtool/Config.Linux.pp

@@ -139,3 +139,8 @@
 // What is the syntax of the STL allocator declaration?  See
 // What is the syntax of the STL allocator declaration?  See
 // LocalSetup.pp for allowable values.
 // LocalSetup.pp for allowable values.
 #define STL_ALLOCATOR GNU
 #define STL_ALLOCATOR GNU
+
+// The dynamic library file extension (usually .so .dll or .dylib):
+#define DYNAMIC_LIB_EXT .so
+  
+

+ 5 - 0
dtool/Config.Win32.pp

@@ -135,3 +135,8 @@
 
 
 // can Intel C++ build this directory successfully (if not, change CC to msvc)
 // can Intel C++ build this directory successfully (if not, change CC to msvc)
 #define NOT_INTEL_BUILDABLE false
 #define NOT_INTEL_BUILDABLE false
+
+// The dynamic library file extension (usually .so .dll or .dylib):
+#define DYNAMIC_LIB_EXT .dll
+  
+

+ 6 - 6
dtool/pptempl/Template.unix.pp

@@ -40,7 +40,7 @@
   // $[bin_targets] the list of binaries.  $[test_bin_targets] is the
   // $[bin_targets] the list of binaries.  $[test_bin_targets] is the
   // list of binaries that are to be built only when specifically asked
   // list of binaries that are to be built only when specifically asked
   // for.
   // for.
-  #define lib_targets $[active_target(metalib_target lib_target ss_lib_target noinst_lib_target):%=$[ODIR]/lib%.so]
+  #define lib_targets $[active_target(metalib_target lib_target ss_lib_target noinst_lib_target):%=$[ODIR]/lib%$[DYNAMIC_LIB_EXT]]
 
 
   #define static_lib_targets $[active_target(static_lib_target):%=$[ODIR]/lib%.a]
   #define static_lib_targets $[active_target(static_lib_target):%=$[ODIR]/lib%.a]
   #define bin_targets $[active_target(bin_target noinst_bin_target sed_bin_target):%=$[ODIR]/%]
   #define bin_targets $[active_target(bin_target noinst_bin_target sed_bin_target):%=$[ODIR]/%]
@@ -330,7 +330,7 @@ igate : $[get_igatedb(metalib_target lib_target ss_lib_target)]
 
 
   #define varname $[subst -,_,lib$[TARGET]_so]
   #define varname $[subst -,_,lib$[TARGET]_so]
 $[varname] = $[sources]
 $[varname] = $[sources]
-  #define target $[ODIR]/lib$[TARGET].so
+  #define target $[ODIR]/lib$[TARGET]$[DYNAMIC_LIB_EXT]
   #define sources $($[varname])
   #define sources $($[varname])
 
 
 $[target] : $[sources] $[static_lib_dependencies]
 $[target] : $[sources] $[static_lib_dependencies]
@@ -345,7 +345,7 @@ $[TAB] $[SHARED_LIB_C]
 // Here are the rules to install and uninstall the library and
 // Here are the rules to install and uninstall the library and
 // everything that goes along with it.
 // everything that goes along with it.
 #define installed_files \
 #define installed_files \
-    $[install_lib_dir]/lib$[TARGET].so \
+    $[install_lib_dir]/lib$[TARGET]$[DYNAMIC_LIB_EXT] \
     $[INSTALL_SCRIPTS:%=$[install_bin_dir]/%] \
     $[INSTALL_SCRIPTS:%=$[install_bin_dir]/%] \
     $[INSTALL_HEADERS:%=$[install_headers_dir]/%] \
     $[INSTALL_HEADERS:%=$[install_headers_dir]/%] \
     $[INSTALL_DATA:%=$[install_data_dir]/%] \
     $[INSTALL_DATA:%=$[install_data_dir]/%] \
@@ -359,8 +359,8 @@ uninstall-lib$[TARGET] :
 $[TAB] rm -f $[sort $[installed_files]]
 $[TAB] rm -f $[sort $[installed_files]]
 #endif
 #endif
 
 
-$[install_lib_dir]/lib$[TARGET].so : $[ODIR]/lib$[TARGET].so
-#define local $[ODIR]/lib$[TARGET].so
+$[install_lib_dir]/lib$[TARGET]$[DYNAMIC_LIB_EXT] : $[ODIR]/lib$[TARGET]$[DYNAMIC_LIB_EXT]
+#define local $[ODIR]/lib$[TARGET]$[DYNAMIC_LIB_EXT]
 #define dest $[install_lib_dir]
 #define dest $[install_lib_dir]
 $[TAB] $[INSTALL]
 $[TAB] $[INSTALL]
 
 
@@ -426,7 +426,7 @@ $[TAB] $[INTERROGATE_MODULE] -oc $[target] -module "$[igatemod]" -library "$[iga
 #forscopes noinst_lib_target
 #forscopes noinst_lib_target
 #define varname $[subst -,_,lib$[TARGET]_so]
 #define varname $[subst -,_,lib$[TARGET]_so]
 $[varname] = $[patsubst %,$[%_obj],$[compile_sources]]
 $[varname] = $[patsubst %,$[%_obj],$[compile_sources]]
-#define target $[ODIR]/lib$[TARGET].so
+#define target $[ODIR]/lib$[TARGET]$[DYNAMIC_LIB_EXT]
 #define sources $($[varname])
 #define sources $($[varname])
 $[target] : $[sources] $[static_lib_dependencies]
 $[target] : $[sources] $[static_lib_dependencies]
 #if $[filter %.cxx %.yxx %.lxx,$[get_sources]]
 #if $[filter %.cxx %.yxx %.lxx,$[get_sources]]