Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / projects / sgconv / build

diff --git a/projects/sgconv/build b/projects/sgconv/build
index 1bc23718283273258ff76eaaca402b2592ebb7d9..676bf74ef4614fb3ce2b20767e27c2012c27ea63 100755 (executable)
--- a/projects/sgconv/build
+++ b/projects/sgconv/build
@@ -72,7 +72,6 @@ printf "       Building sgconv for $sys $release\n"
 printf "#############################################################################\n"
 
 STG_LIBS="logger.lib
 printf "#############################################################################\n"
 
 STG_LIBS="logger.lib

-          locker.lib

           crypto.lib
           common.lib
           conffiles.lib
           crypto.lib
           common.lib
           conffiles.lib


@@ -100,7 +99,6 @@ else
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread
             then
                 DEFS="$DEFS -DDARWIN"
                 LIB_THREAD=-lpthread

-                LIBICONV=""

             else
                 LIB_THREAD=-lc_r
             fi
             else
                 LIB_THREAD=-lc_r
             fi