2010-11-07 17:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbhpdf/hbhpdf.hbp
  * contrib/hbhpdf/hbhpdf.hbc

  * contrib/hbexpat/3rd/expat/expat.hbc
    ! Fixed for 'HB_BUILD_CONTRIB_DYN=yes'

  * external/Makefile
  - external/libhpdf
  + contrib/hbhpdf/3rd
  + contrib/hbhpdf/3rd/libhpdf
  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc
  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
    * Moved to contrib local dir.
    + Added support for 'HB_BUILD_CONTRIB_DYN=yes'

  * contrib/hbhpdf/3rd/libhpdf/hpdf.h
    ! Fixed for dynamic build.
    ; TODO: Regenerate .dif. For me it restored original copy for some reason :(

  * contrib/hbsqlit3/hbsqlit3.hbc
  * contrib/sddsqlt3/sddsqlt3.hbc
    * Using .hbc file for 3rd party lib.

  * contrib/3rd/sqlite3/sqlite3.hbp
  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
  * contrib/hbmzip/3rd/minizip/minizip.hbp
  * contrib/hbexpat/3rd/expat/expat.hbp
    ! Changed -warn=no to -warn=low, which is equivalent to 'HB_BUILD_WARN := no'
      in Makefile.

harbour/ChangeLog

@@ -16,6 +16,37 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-07 17:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbhpdf/hbhpdf.hbp
+  * contrib/hbhpdf/hbhpdf.hbc
+
+  * contrib/hbexpat/3rd/expat/expat.hbc
+    ! Fixed for 'HB_BUILD_CONTRIB_DYN=yes'
+
+  * external/Makefile
+  - external/libhpdf
+  + contrib/hbhpdf/3rd
+  + contrib/hbhpdf/3rd/libhpdf
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+    * Moved to contrib local dir.
+    + Added support for 'HB_BUILD_CONTRIB_DYN=yes'
+
+  * contrib/hbhpdf/3rd/libhpdf/hpdf.h
+    ! Fixed for dynamic build.
+    ; TODO: Regenerate .dif. For me it restored original copy for some reason :(
+
+  * contrib/hbsqlit3/hbsqlit3.hbc
+  * contrib/sddsqlt3/sddsqlt3.hbc
+    * Using .hbc file for 3rd party lib.
+
+  * contrib/3rd/sqlite3/sqlite3.hbp
+  * contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp
+  * contrib/hbmzip/3rd/minizip/minizip.hbp
+  * contrib/hbexpat/3rd/expat/expat.hbp
+    ! Changed -warn=no to -warn=low, which is equivalent to 'HB_BUILD_WARN := no'
+      in Makefile.
+
 2010-11-07 16:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   - external/sqlite3
     * Wrestle with svn and its bl$dy tree conflicts.

harbour/contrib/3rd/sqlite3/sqlite3.hbp

@@ -16,7 +16,7 @@
 
 -o${hb_targetname}
 
--warn=no
+-warn=low
 -cpp=no
 
 -cflag=-DSQLITE_OMIT_DEPRECATED

harbour/contrib/hbexpat/3rd/expat/expat.hbc

@@ -2,4 +2,4 @@
 # $Id$
 #
 
-libs=${hb_name}
+libs=${hb_name}${__HB_DYN__}

harbour/contrib/hbexpat/3rd/expat/expat.hbp

@@ -9,7 +9,7 @@
 
 -o${hb_targetname}
 
--warn=no
+-warn=low
 
 xmlparse.c
 xmlrole.c

harbour/contrib/hbhpdf/3rd/libhpdf/hpdf.h

@@ -472,7 +472,7 @@ HPDF_Page_CreateURILinkAnnot  (HPDF_Page     page,
                                const char   *uri);
 
 
-HPDF_Annotation
+HPDF_EXPORT(HPDF_Annotation)
 HPDF_Page_CreateTextMarkupAnnot (HPDF_Page     page,
 								HPDF_Rect      rect,
 								const char     *text,
@@ -600,7 +600,7 @@ HPDF_EXPORT(HPDF_STATUS)
 HPDF_TextMarkupAnnot_SetQuadPoints ( HPDF_Annotation annot, HPDF_Point lb, HPDF_Point rb, HPDF_Point rt, HPDF_Point lt); /* l-left, r-right, b-bottom, t-top positions */
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_Annot_Set3DView  ( HPDF_MMgr mmgr, 
+HPDF_Annot_Set3DView  ( HPDF_MMgr mmgr,
 					 	HPDF_Annotation	annot,
 					 	HPDF_Annotation	annot3d,
 					 	HPDF_Dict			view);
@@ -622,8 +622,8 @@ HPDF_EXPORT(HPDF_STATUS)
 HPDF_FreeTextAnnot_SetDefaultStyle (HPDF_Annotation  annot, const char* style);
 
 HPDF_EXPORT(HPDF_STATUS)
-HPDF_LineAnnot_SetPosition (HPDF_Annotation annot, 
-							HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle, 
+HPDF_LineAnnot_SetPosition (HPDF_Annotation annot,
+							HPDF_Point startPoint, HPDF_LineAnnotEndingStyle startStyle,
 							HPDF_Point endPoint, HPDF_LineAnnotEndingStyle endStyle);
 
 HPDF_EXPORT(HPDF_STATUS)
@@ -1440,17 +1440,16 @@ HPDF_EXPORT(HPDF_OutputIntent)
 HPDF_ICC_LoadIccFromMem (HPDF_Doc   pdf,
                         HPDF_MMgr   mmgr,
                         HPDF_Stream iccdata,
-                        HPDF_Xref   xref, 
+                        HPDF_Xref   xref,
                         int         numcomponent);
 
 HPDF_EXPORT(HPDF_OutputIntent)
 HPDF_LoadIccProfileFromFile  (HPDF_Doc  pdf,
                             const char* icc_file_name,
                                    int  numcomponent);
-                                   
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
 #endif /* _HPDF_H */
-

harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbc

@@ -0,0 +1,6 @@
+#
+# $Id$
+#
+
+libs=${hb_name}${__HB_DYN__}
+libs=png

harbour/contrib/hbhpdf/3rd/libhpdf/libhpdf.hbp

@@ -9,7 +9,7 @@
 
 -o${hb_targetname}
 
--warn=no
+-warn=low
 -cpp=no
 
 -depkeyhead=png:png.h
@@ -17,7 +17,7 @@
 -depcontrol=png:${HB_WITH_PNG}
 -depincpath=png:/usr/include
 -depincpath=png:/opt/local/include
--depincpathlocal=png:../../external/png
+-depincpathlocal=png:../../../../external/png
 
 # This is a dependency of png
 -depkeyhead=zlib:zlib.h
@@ -26,11 +26,11 @@
 -depincpath=zlib:/usr/include
 -depincpath=zlib:/usr/local/include
 -depincpath=zlib:/boot/develop/headers/3rdparty
--depincpathlocal=zlib:../../external/zlib
+-depincpathlocal=zlib:../../../../external/zlib
 
 # Suppress deprecated warnings until libharu gets updated for latest libpng
 -cflag=-DPNG_NO_PEDANTIC_WARNINGS
--cflag=-DHPDF_DLL_MAKE{hbdyn}
+-cflag=-DHPDF_DLL_MAKE_CDECL{hbdyn}
 -cflag=-U__COREDLL__{mingwarm}
 
 _hbhbpdf.c

harbour/contrib/hbhpdf/hbhpdf.hbc

@@ -5,5 +5,4 @@
 incpaths=.
 
 libs=${hb_name}${__HB_DYN__}
-libs=libhpdf
-libs=png
+libs=3rd/libhpdf/libhpdf.hbc

harbour/contrib/hbhpdf/hbhpdf.hbp

@@ -21,3 +21,5 @@
 -instfile=inc:harupdf.ch
 
 harupdf.c
+
+3rd/libhpdf/libhpdf.hbc

harbour/contrib/hbmzip/3rd/minizip/minizip.hbp

@@ -7,7 +7,7 @@
 
 -o${hb_targetname}
 
--warn=no
+-warn=low
 -cpp=no
 
 ioapi.c

harbour/contrib/hbsqlit3/hbsqlit3.hbc

@@ -5,4 +5,4 @@
 incpaths=.
 
 libs=${hb_name}${__HB_DYN__}
-libs=sqlite3
+libs=../3rd/sqlite3/sqlite3.hbc

harbour/contrib/sddsqlt3/sddsqlt3.hbc

@@ -3,6 +3,6 @@
 #
 
 libs=${hb_name}${__HB_DYN__}
-libs=sqlite3
+libs=../3rd/sqlite3/sqlite3.hbc
 
 libs=../rddsql/rddsql.hbc

harbour/external/Makefile

@@ -6,7 +6,6 @@ ROOT := ../
 
 DIRS := \
    bzip2 \
-   libhpdf \
    hbpmcom \
    png \
    jpeg \