2009-04-02 15:10 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

* bin/postinst.bat
  + utils/hbi18n/hbi18n.hbm
    + Generating hbmk2-dll and hbi18n-dll shared-mode executables.

  * utils/hbmk2/hbmk2.prg
    ! Fixed shared libnames for MinGW family.
    ; TOFIX: Still doesn't build shared-mode executables.
This commit is contained in:
Viktor Szakats
2009-04-02 13:11:23 +00:00
parent c2bfed14d8
commit 18ac970301
5 changed files with 31 additions and 3 deletions

View File

@@ -8,6 +8,15 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-04-02 15:10 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* bin/postinst.bat
+ utils/hbi18n/hbi18n.hbm
+ Generating hbmk2-dll and hbi18n-dll shared-mode executables.
* utils/hbmk2/hbmk2.prg
! Fixed shared libnames for MinGW family.
; TOFIX: Still doesn't build shared-mode executables.
2009-04-02 13:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-mkdyn.bat
* bin/postinst.bat

View File

@@ -43,6 +43,8 @@ if not "%HB_DYNLIB%" == "yes" goto _SKIP_DLL_BIN
if exist "%_HB_BIN_INSTALL%\*.dll" (
%HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbrun-dll %~dp0..\utils\hbrun\hbrun.hbm -lhbcplr -lhbpp -lhbcommon
%HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbtest-dll %~dp0..\utils\hbtest\hbtest.hbm
%HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbmk2-dll %~dp0..\utils\hbmk2\hbmk2.hbm
%HB_BIN_INSTALL%\hbmk2 -q0 -shared -o%_HB_BIN_INSTALL%\hbi18n-dll %~dp0..\utils\hbi18n\hbi18n.hbm
)
endlocal

View File

@@ -139,7 +139,7 @@ if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL%
:DO_GCC
set HB_DYNLIB=no
%_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
%_HB_MAKE% install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9
goto MAKE_DONE
:SKIP_WINDLL

View File

@@ -0,0 +1,5 @@
#
# $Id$
#
hbi18n.prg

View File

@@ -1417,8 +1417,20 @@ FUNCTION Main( ... )
s_aLIBSYS := ArrayAJoin( { s_aLIBSYS, s_aLIBSYSCORE, s_aLIBSYSMISC } )
ENDIF
ENDIF
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter,;
"harbour-" + cDL_Version_Alter ) }
DO CASE
CASE t_cCOMP == "mingw64"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-x64",;
"harbour-" + cDL_Version_Alter + "-x64" ) }
CASE t_cCOMP == "mingwce"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm",;
"harbour-" + cDL_Version_Alter + "-arm" ) }
CASE t_cCOMP == "mingwarm"
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter + "-arm",;
"harbour-" + cDL_Version_Alter + "-arm" ) }
OTHERWISE
s_aLIBSHARED := { iif( s_lMT, "harbourmt-" + cDL_Version_Alter,;
"harbour-" + cDL_Version_Alter ) }
ENDCASE
IF s_lFMSTAT != NIL .AND. s_lFMSTAT
AAdd( s_aLIBFM, iif( s_lMT, "hbfmmt", "hbfm" ) )