From 3786032100c34e2196bbb8af1e89226b05fbc324 Mon Sep 17 00:00:00 2001 From: lloyd Date: Thu, 19 Nov 2009 23:34:17 +0000 Subject: Most compilers had empty dll_*_flags; remove them since the default is empty anyway. For VC++ (only user) set BOTAN_DLL to dllimport by default (for apps), and then redefine as dllexport when building the library. --- configure.py | 3 +-- src/build-data/botan.iss.in | 2 +- src/build-data/buildh.in | 2 +- src/build-data/cc/compaq.txt | 3 --- src/build-data/cc/ekopath.txt | 3 --- src/build-data/cc/gcc.txt | 3 --- src/build-data/cc/hpcc.txt | 3 --- src/build-data/cc/icc.txt | 3 --- src/build-data/cc/kai.txt | 3 --- src/build-data/cc/mipspro.txt | 3 --- src/build-data/cc/msvc.txt | 3 +-- src/build-data/cc/open64.txt | 3 --- src/build-data/cc/pgi.txt | 3 --- src/build-data/cc/sgipro64.txt | 3 --- src/build-data/cc/sunwspro.txt | 3 --- src/build-data/cc/xlc.txt | 3 --- 16 files changed, 4 insertions(+), 42 deletions(-) diff --git a/configure.py b/configure.py index 668d03986..5085b2f70 100755 --- a/configure.py +++ b/configure.py @@ -535,7 +535,6 @@ class CompilerInfo(object): 'lang_flags': '', 'warning_flags': '', 'dll_import_flags': '', - 'dll_export_flags': '', 'ar_command': None, 'makefile_style': '', 'compiler_has_tr1': False, @@ -831,7 +830,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): 'lang_flags': cc.lang_flags + options.extra_flags, 'warn_flags': cc.warning_flags, 'shared_flags': cc.shared_flags, - 'dll_export_flags': cc.dll_export_flags, + 'dll_import_flags': cc.dll_import_flags, 'so_link': cc.so_link_command_for(osinfo.basename), diff --git a/src/build-data/botan.iss.in b/src/build-data/botan.iss.in index 27e5d3784..ee8229f3f 100644 --- a/src/build-data/botan.iss.in +++ b/src/build-data/botan.iss.in @@ -18,5 +18,5 @@ SolidCompression=yes OutputDir=. [Files] -Source: "..\libbotan.lib"; DestDir: "{app}" +Source: "..\libbotan.dll"; DestDir: "{app}" Source: "include\botan\*"; DestDir: "{app}\include\botan" diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in index e0d8368ed..37ff06f9d 100644 --- a/src/build-data/buildh.in +++ b/src/build-data/buildh.in @@ -9,7 +9,7 @@ #define BOTAN_VERSION_PATCH %{version_patch} #ifndef BOTAN_DLL - #define BOTAN_DLL %{dll_export_flags} + #define BOTAN_DLL %{dll_import_flags} #endif /* Chunk sizes */ diff --git a/src/build-data/cc/compaq.txt b/src/build-data/cc/compaq.txt index b5a080ae9..7e7f1ea56 100644 --- a/src/build-data/cc/compaq.txt +++ b/src/build-data/cc/compaq.txt @@ -15,9 +15,6 @@ debug_flags -g no_debug_flags "" lang_flags "-std ansi -D__USE_STD_IOSTREAM" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt index bff1ff460..ac514261e 100644 --- a/src/build-data/cc/ekopath.txt +++ b/src/build-data/cc/ekopath.txt @@ -18,9 +18,6 @@ ar_command "pathCC -ar -o" shared_flags "-fPIC" debug_flags -g -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index f0806fe7a..73e1ecf06 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -20,9 +20,6 @@ shared_flags "-fPIC" debug_flags -g no_debug_flags "-finline-functions" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt index 614830f9e..4b21a03de 100644 --- a/src/build-data/cc/hpcc.txt +++ b/src/build-data/cc/hpcc.txt @@ -16,9 +16,6 @@ lang_flags "-AA -ext +eh -z" warning_flags "" # +w shared_flags "+Z" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt index 10e689e1a..ea7936870 100644 --- a/src/build-data/cc/icc.txt +++ b/src/build-data/cc/icc.txt @@ -18,9 +18,6 @@ lang_flags "" warning_flags "-w1" shared_flags "-fPIC" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/kai.txt b/src/build-data/cc/kai.txt index 52fb7c5e1..2d9c0cd65 100644 --- a/src/build-data/cc/kai.txt +++ b/src/build-data/cc/kai.txt @@ -16,9 +16,6 @@ lang_flags "-D__KAI_STRICT" debug_flags -g no_debug_flags "" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/mipspro.txt b/src/build-data/cc/mipspro.txt index 2de03938a..28b47b30d 100644 --- a/src/build-data/cc/mipspro.txt +++ b/src/build-data/cc/mipspro.txt @@ -18,9 +18,6 @@ lang_flags "-ansi -LANG:ansi-for-init-scope=ON" # headers #warning_flags "-fullwarn" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index 805093ce5..bbc6345bc 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -8,7 +8,7 @@ add_include_dir_option "/I" add_lib_dir_option -L add_lib_option "" -lib_opt_flags "/O2" +lib_opt_flags "/O2 /DBOTAN_DLL=__declspec(dllexport)" check_opt_flags "/O2" debug_flags "/Zi" no_debug_flags "" @@ -16,7 +16,6 @@ lang_flags "/EHsc /GR /D_CONSOLE" warning_flags "" dll_import_flags "__declspec(dllimport)" -dll_export_flags "__declspec(dllexport)" ar_command "lib" diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt index 275d25f72..34359ef63 100644 --- a/src/build-data/cc/open64.txt +++ b/src/build-data/cc/open64.txt @@ -16,9 +16,6 @@ shared_flags "-fPIC" lang_flags "-ansi -LANG:ansi-for-init-scope=ON" warning_flags "-Wall -W" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt index 99f7bcea5..0e4f8baf2 100644 --- a/src/build-data/cc/pgi.txt +++ b/src/build-data/cc/pgi.txt @@ -12,9 +12,6 @@ lib_opt_flags "-fast -Minline" check_opt_flags "-fast" shared_flags "-fPIC" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/sgipro64.txt b/src/build-data/cc/sgipro64.txt index a359ef5ae..e6a58f16d 100644 --- a/src/build-data/cc/sgipro64.txt +++ b/src/build-data/cc/sgipro64.txt @@ -16,9 +16,6 @@ shared_flags "-KPIC" lang_flags "-ansi -LANG:ansi-for-init-scope=ON" warning_flags "-Wall -W" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/sunwspro.txt b/src/build-data/cc/sunwspro.txt index ee41ebeca..bd86ade33 100644 --- a/src/build-data/cc/sunwspro.txt +++ b/src/build-data/cc/sunwspro.txt @@ -18,9 +18,6 @@ shared_flags "-KPIC" warning_flags "+w" lang_flags "+p -D__EXTENSIONS__" -dll_import_flags "" -dll_export_flags "" - makefile_style unix diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt index e9ae41c1a..87b32746b 100644 --- a/src/build-data/cc/xlc.txt +++ b/src/build-data/cc/xlc.txt @@ -14,9 +14,6 @@ lang_flags "" debug_flags -g no_debug_flags "" -dll_import_flags "" -dll_export_flags "" - makefile_style unix -- cgit v1.2.3