From eb029e1f8a68b7112bfcc3bf35a3d2f7d5ca4ca4 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 11 Jan 2012 13:50:02 +0000 Subject: [PATCH] 2012-01-11 14:47 UTC+0100 Viktor Szakats (harbour syenar.net) * tests/testdyn.prg ! fixed typo discovered by Alex Strickland. Thank you. * contrib/hbrun/hbrun.hbp - deleted unfinished solution for "DSO" builds (having two TOFIXes for many months). Please supply required extra libs ('m' and 'z' in case of hbrun) manually to the build via HB_USER_LDFLAGS, HB_USER_LIBS, until a complete solution is discovered. --- harbour/ChangeLog | 11 +++++++++++ harbour/contrib/hbrun/hbrun.hbp | 7 ------- harbour/tests/testdyn.prg | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d66f9d37a0..84da2732d8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2012-01-11 14:47 UTC+0100 Viktor Szakats (harbour syenar.net) + * tests/testdyn.prg + ! fixed typo discovered by Alex Strickland. Thank you. + + * contrib/hbrun/hbrun.hbp + - deleted unfinished solution for "DSO" builds (having two + TOFIXes for many months). Please supply required extra libs + ('m' and 'z' in case of hbrun) manually to the build via + HB_USER_LDFLAGS, HB_USER_LIBS, until a complete solution is + discovered. + 2012-01-10 14:38 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/include/hbhrb.ch * harbour/src/vm/runner.c diff --git a/harbour/contrib/hbrun/hbrun.hbp b/harbour/contrib/hbrun/hbrun.hbp index d5672c0e1b..1c88eed77d 100644 --- a/harbour/contrib/hbrun/hbrun.hbp +++ b/harbour/contrib/hbrun/hbrun.hbp @@ -25,13 +25,6 @@ pullext.prg -lhbpmcom{dos} -# required by some recent Linux distros that are using the DSO linking model -# TOFIX: move these lines to the respective .hbc files actually needing them -# TOFIX: HB_HAS_ZLIB_LOCAL usage is wrong as it will only work when .hbp is -# built as part of Harbour core build process. -{HB_BUILD_DSO='yes'&linux}-lm -{HB_BUILD_DSO='yes'&linux&!HB_HAS_ZLIB_LOCAL}-lz - # not using these together with .rc input, because some compilers (mingw) # do not support multiple .rc inputs #-icon={allwin}../../package/harb_win.ico diff --git a/harbour/tests/testdyn.prg b/harbour/tests/testdyn.prg index 93cd3e66cc..0a73ed23c6 100644 --- a/harbour/tests/testdyn.prg +++ b/harbour/tests/testdyn.prg @@ -85,7 +85,7 @@ PROCEDURE Main() ? "cData:", cData, "<" ? "------" cData := Space( MAX_PATH ) - ? "HB_DYNCALL (PARAMS): ", hb_dynCall( { "SHGetSpecialFolderPathA", hLib, HB_DYN_CALLCONV_STDCALL, NIL, NIL, HB_DYN_CTYPE_BOOL }, 0, @cData, CSIDL_APPDATA, 0 ) + ? "HB_DYNCALL (PARAMS): ", hb_dynCall( { "SHGetSpecialFolderPathA", hLib, HB_DYN_CALLCONV_STDCALL, NIL, NIL, NIL, HB_DYN_CTYPE_BOOL }, 0, @cData, CSIDL_APPDATA, 0 ) ? "@cData: ", cData, "<" ? "------" cData := Space( MAX_PATH )