From c2f42795d272e717dc4cc8e168f70e222cef0d56 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 21 Aug 2009 12:41:20 +0000 Subject: [PATCH] 2009-08-21 14:41 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/bin/hb-func.sh * added oleaut32 to default linked library list --- harbour/ChangeLog | 4 ++++ harbour/bin/hb-func.sh | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0434e43f7b..d7186ee2ea 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-21 14:41 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/bin/hb-func.sh + * added oleaut32 to default linked library list + 2009-08-21 14:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * source/dynlib/Makefile * source/Makefile diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index 5a6e991aa8..e60e72f28b 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -190,10 +190,10 @@ mk_hbtools() fi if [ "${HB_COMPILER}" = "mingw" ] || \ [ "${HB_COMPILER}" = "mingw64" ]; then - HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32 -lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32" + HB_SYS_LIBS="${HB_SYS_LIBS} -luser32 -lwinspool -lgdi32 -lcomctl32 -ladvapi32-lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32" HB_WITHOUT_X11="yes" elif [ "${HB_COMPILER}" = "mingwarm" ]; then - HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32" + HB_SYS_LIBS="${HB_SYS_LIBS} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32 -loleaut32" HB_WITHOUT_X11="yes" elif [ "${HB_COMPILER}" = "djgpp" ]; then HB_SYS_LIBS="${HB_SYS_LIBS}" @@ -802,7 +802,7 @@ mk_hblibso() if [ "${HB_COMPILER}" = "mingw" ] || [ "${HB_COMPILER}" = "mingw64" ]; then linker_options="${linker_options} -luser32 -lwinspool -lgdi32 -lcomctl32 -ladvapi32 -lcomdlg32 -lole32 -loleaut32 -luuid -lws2_32" elif [ "${HB_COMPILER}" = "mingwarm" ]; then - linker_options="${linker_options} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32" + linker_options="${linker_options} -lwininet -lws2 -lcommdlg -lcommctrl -luuid -lole32 -loleaut32" elif [ "${HB_COMPILER}" = "djgpp" ]; then linker_options="${linker_options}" elif [ "${HB_ARCHITECTURE}" = "linux" ]; then