diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 32910be6c8..c47b8b01e9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,18 +8,44 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-01 01:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + - contrib/btree + + contrib/hbbtree + - contrib/directx + + contrib/hbw32ddr + * contrib/hbw32ddr/Makefile + * contrib/hbw32ddr/common.mak + - contrib/firebird + + contrib/hbfbird + * contrib/hbfbird/Makefile + * contrib/hbfbird/common.mak + - contrib/freeimage + + contrib/hbfimage + * contrib/hbfimage/Makefile + * contrib/hbfimage/common.mak + - contrib/gd + + contrib/hbgd + - contrib/hbzlib + + contrib/hbziparch + * contrib/hbziparch/make_b32_dll.bat + * contrib/hbziparch/make_b32_dll.mak + * contrib/Makefile + * contrib/make_b32_all.bat + * contrib/make_vc_all.bat + * Contrib lib rename continued. + 2007-12-01 00:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) - contrib/apollo + contrib/hbapollo * contrib/hbapollo/common.mak * contrib/hbapollo/Makefile - * harbour/contrib/make_b32_all.bat - * harbour/contrib/make_vc_all.bat + * contrib/make_b32_all.bat + * contrib/make_vc_all.bat * First contrib lib rename (live rehearsal). (goals: hb prefix, dirname = libname, 8 chars limit) - * harbour/contrib/make_b32_all.bat - * harbour/contrib/make_vc_all.bat + * contrib/make_b32_all.bat + * contrib/make_vc_all.bat * DIRS internal envvar renamed to _HB_DIRS. 2007-11-30 20:30 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl) diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index e663873680..dffe7db6dd 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -5,7 +5,7 @@ ROOT = ../ DIRS=\ - btree \ + hbbtree \ htmllib \ libct \ libgt \ diff --git a/harbour/contrib/btree/Makefile b/harbour/contrib/hbbtree/Makefile similarity index 100% rename from harbour/contrib/btree/Makefile rename to harbour/contrib/hbbtree/Makefile diff --git a/harbour/contrib/btree/common.mak b/harbour/contrib/hbbtree/common.mak similarity index 100% rename from harbour/contrib/btree/common.mak rename to harbour/contrib/hbbtree/common.mak diff --git a/harbour/contrib/btree/doc/hb_btree.txt b/harbour/contrib/hbbtree/doc/hb_btree.txt similarity index 100% rename from harbour/contrib/btree/doc/hb_btree.txt rename to harbour/contrib/hbbtree/doc/hb_btree.txt diff --git a/harbour/contrib/btree/hb_btree.api b/harbour/contrib/hbbtree/hb_btree.api similarity index 100% rename from harbour/contrib/btree/hb_btree.api rename to harbour/contrib/hbbtree/hb_btree.api diff --git a/harbour/contrib/btree/hb_btree.c b/harbour/contrib/hbbtree/hb_btree.c similarity index 100% rename from harbour/contrib/btree/hb_btree.c rename to harbour/contrib/hbbtree/hb_btree.c diff --git a/harbour/contrib/btree/hb_btree.ch b/harbour/contrib/hbbtree/hb_btree.ch similarity index 100% rename from harbour/contrib/btree/hb_btree.ch rename to harbour/contrib/hbbtree/hb_btree.ch diff --git a/harbour/contrib/btree/make_b32.bat b/harbour/contrib/hbbtree/make_b32.bat similarity index 100% rename from harbour/contrib/btree/make_b32.bat rename to harbour/contrib/hbbtree/make_b32.bat diff --git a/harbour/contrib/btree/make_vc.bat b/harbour/contrib/hbbtree/make_vc.bat similarity index 100% rename from harbour/contrib/btree/make_vc.bat rename to harbour/contrib/hbbtree/make_vc.bat diff --git a/harbour/contrib/btree/tbtree.prg b/harbour/contrib/hbbtree/tbtree.prg similarity index 100% rename from harbour/contrib/btree/tbtree.prg rename to harbour/contrib/hbbtree/tbtree.prg diff --git a/harbour/contrib/btree/test/Makefile b/harbour/contrib/hbbtree/test/Makefile similarity index 100% rename from harbour/contrib/btree/test/Makefile rename to harbour/contrib/hbbtree/test/Makefile diff --git a/harbour/contrib/btree/test/ctest.c b/harbour/contrib/hbbtree/test/ctest.c similarity index 100% rename from harbour/contrib/btree/test/ctest.c rename to harbour/contrib/hbbtree/test/ctest.c diff --git a/harbour/contrib/btree/test/mktest.bat b/harbour/contrib/hbbtree/test/mktest.bat similarity index 100% rename from harbour/contrib/btree/test/mktest.bat rename to harbour/contrib/hbbtree/test/mktest.bat diff --git a/harbour/contrib/btree/test/test.prg b/harbour/contrib/hbbtree/test/test.prg similarity index 100% rename from harbour/contrib/btree/test/test.prg rename to harbour/contrib/hbbtree/test/test.prg diff --git a/harbour/contrib/btree/test/ttest.prg b/harbour/contrib/hbbtree/test/ttest.prg similarity index 100% rename from harbour/contrib/btree/test/ttest.prg rename to harbour/contrib/hbbtree/test/ttest.prg diff --git a/harbour/contrib/firebird/Makefile b/harbour/contrib/hbfbird/Makefile similarity index 90% rename from harbour/contrib/firebird/Makefile rename to harbour/contrib/hbfbird/Makefile index 6a45c44fdc..e02727374c 100644 --- a/harbour/contrib/firebird/Makefile +++ b/harbour/contrib/hbfbird/Makefile @@ -12,6 +12,6 @@ C_SOURCES=\ PRG_SOURCES=\ tfirebird.prg \ -LIBNAME=firebird +LIBNAME=hbfbird include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/firebird/common.mak b/harbour/contrib/hbfbird/common.mak similarity index 89% rename from harbour/contrib/firebird/common.mak rename to harbour/contrib/hbfbird/common.mak index 64ea9a262f..6b7cb0cb8b 100644 --- a/harbour/contrib/firebird/common.mak +++ b/harbour/contrib/hbfbird/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = firebird +LIBNAME = hbfbird LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) diff --git a/harbour/contrib/firebird/firebird.c b/harbour/contrib/hbfbird/firebird.c similarity index 100% rename from harbour/contrib/firebird/firebird.c rename to harbour/contrib/hbfbird/firebird.c diff --git a/harbour/contrib/firebird/make_b32.bat b/harbour/contrib/hbfbird/make_b32.bat similarity index 100% rename from harbour/contrib/firebird/make_b32.bat rename to harbour/contrib/hbfbird/make_b32.bat diff --git a/harbour/contrib/firebird/make_vc.bat b/harbour/contrib/hbfbird/make_vc.bat similarity index 100% rename from harbour/contrib/firebird/make_vc.bat rename to harbour/contrib/hbfbird/make_vc.bat diff --git a/harbour/contrib/firebird/readme.txt b/harbour/contrib/hbfbird/readme.txt similarity index 100% rename from harbour/contrib/firebird/readme.txt rename to harbour/contrib/hbfbird/readme.txt diff --git a/harbour/contrib/firebird/test/Makefile b/harbour/contrib/hbfbird/test/Makefile similarity index 100% rename from harbour/contrib/firebird/test/Makefile rename to harbour/contrib/hbfbird/test/Makefile diff --git a/harbour/contrib/firebird/test/bld_b32.bat b/harbour/contrib/hbfbird/test/bld_b32.bat similarity index 100% rename from harbour/contrib/firebird/test/bld_b32.bat rename to harbour/contrib/hbfbird/test/bld_b32.bat diff --git a/harbour/contrib/firebird/test/simple.prg b/harbour/contrib/hbfbird/test/simple.prg similarity index 100% rename from harbour/contrib/firebird/test/simple.prg rename to harbour/contrib/hbfbird/test/simple.prg diff --git a/harbour/contrib/firebird/test/stress.prg b/harbour/contrib/hbfbird/test/stress.prg similarity index 100% rename from harbour/contrib/firebird/test/stress.prg rename to harbour/contrib/hbfbird/test/stress.prg diff --git a/harbour/contrib/firebird/test/test.prg b/harbour/contrib/hbfbird/test/test.prg similarity index 100% rename from harbour/contrib/firebird/test/test.prg rename to harbour/contrib/hbfbird/test/test.prg diff --git a/harbour/contrib/firebird/test/testapi.c b/harbour/contrib/hbfbird/test/testapi.c similarity index 100% rename from harbour/contrib/firebird/test/testapi.c rename to harbour/contrib/hbfbird/test/testapi.c diff --git a/harbour/contrib/firebird/tfirebird.prg b/harbour/contrib/hbfbird/tfirebird.prg similarity index 100% rename from harbour/contrib/firebird/tfirebird.prg rename to harbour/contrib/hbfbird/tfirebird.prg diff --git a/harbour/contrib/freeimage/Makefile b/harbour/contrib/hbfimage/Makefile similarity index 88% rename from harbour/contrib/freeimage/Makefile rename to harbour/contrib/hbfimage/Makefile index df885dd5a0..5de61606a7 100644 --- a/harbour/contrib/freeimage/Makefile +++ b/harbour/contrib/hbfimage/Makefile @@ -13,6 +13,6 @@ PRG_SOURCES= \ PRG_HEADERS=\ freeimage.ch \ -LIBNAME=hbfreeimage +LIBNAME=hbfimage include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/freeimage/common.mak b/harbour/contrib/hbfimage/common.mak similarity index 90% rename from harbour/contrib/freeimage/common.mak rename to harbour/contrib/hbfimage/common.mak index 7ed0fc8019..0b230d1132 100644 --- a/harbour/contrib/freeimage/common.mak +++ b/harbour/contrib/hbfimage/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = hbfreeimage +LIBNAME = hbfimage LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) diff --git a/harbour/contrib/freeimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c similarity index 100% rename from harbour/contrib/freeimage/fi_winfu.c rename to harbour/contrib/hbfimage/fi_winfu.c diff --git a/harbour/contrib/freeimage/fi_wrp.c b/harbour/contrib/hbfimage/fi_wrp.c similarity index 100% rename from harbour/contrib/freeimage/fi_wrp.c rename to harbour/contrib/hbfimage/fi_wrp.c diff --git a/harbour/contrib/freeimage/freeimage.ch b/harbour/contrib/hbfimage/freeimage.ch similarity index 100% rename from harbour/contrib/freeimage/freeimage.ch rename to harbour/contrib/hbfimage/freeimage.ch diff --git a/harbour/contrib/freeimage/make_b32.bat b/harbour/contrib/hbfimage/make_b32.bat similarity index 100% rename from harbour/contrib/freeimage/make_b32.bat rename to harbour/contrib/hbfimage/make_b32.bat diff --git a/harbour/contrib/freeimage/make_vc.bat b/harbour/contrib/hbfimage/make_vc.bat similarity index 100% rename from harbour/contrib/freeimage/make_vc.bat rename to harbour/contrib/hbfimage/make_vc.bat diff --git a/harbour/contrib/freeimage/readme.txt b/harbour/contrib/hbfimage/readme.txt similarity index 100% rename from harbour/contrib/freeimage/readme.txt rename to harbour/contrib/hbfimage/readme.txt diff --git a/harbour/contrib/freeimage/test/bld_b32.bat b/harbour/contrib/hbfimage/test/bld_b32.bat similarity index 100% rename from harbour/contrib/freeimage/test/bld_b32.bat rename to harbour/contrib/hbfimage/test/bld_b32.bat diff --git a/harbour/contrib/freeimage/test/fitest.prg b/harbour/contrib/hbfimage/test/fitest.prg similarity index 100% rename from harbour/contrib/freeimage/test/fitest.prg rename to harbour/contrib/hbfimage/test/fitest.prg diff --git a/harbour/contrib/freeimage/test/fsg.jpg b/harbour/contrib/hbfimage/test/fsg.jpg similarity index 100% rename from harbour/contrib/freeimage/test/fsg.jpg rename to harbour/contrib/hbfimage/test/fsg.jpg diff --git a/harbour/contrib/freeimage/test/italia.gif b/harbour/contrib/hbfimage/test/italia.gif similarity index 100% rename from harbour/contrib/freeimage/test/italia.gif rename to harbour/contrib/hbfimage/test/italia.gif diff --git a/harbour/contrib/freeimage/test/sample1.jpg b/harbour/contrib/hbfimage/test/sample1.jpg similarity index 100% rename from harbour/contrib/freeimage/test/sample1.jpg rename to harbour/contrib/hbfimage/test/sample1.jpg diff --git a/harbour/contrib/gd/ChangeLog b/harbour/contrib/hbgd/ChangeLog similarity index 100% rename from harbour/contrib/gd/ChangeLog rename to harbour/contrib/hbgd/ChangeLog diff --git a/harbour/contrib/gd/Makefile b/harbour/contrib/hbgd/Makefile similarity index 100% rename from harbour/contrib/gd/Makefile rename to harbour/contrib/hbgd/Makefile diff --git a/harbour/contrib/gd/common.mak b/harbour/contrib/hbgd/common.mak similarity index 100% rename from harbour/contrib/gd/common.mak rename to harbour/contrib/hbgd/common.mak diff --git a/harbour/contrib/gd/doc/COPYING b/harbour/contrib/hbgd/doc/COPYING similarity index 100% rename from harbour/contrib/gd/doc/COPYING rename to harbour/contrib/hbgd/doc/COPYING diff --git a/harbour/contrib/gd/doc/hbgd.txt b/harbour/contrib/hbgd/doc/hbgd.txt similarity index 100% rename from harbour/contrib/gd/doc/hbgd.txt rename to harbour/contrib/hbgd/doc/hbgd.txt diff --git a/harbour/contrib/gd/gd.ch b/harbour/contrib/hbgd/gd.ch similarity index 100% rename from harbour/contrib/gd/gd.ch rename to harbour/contrib/hbgd/gd.ch diff --git a/harbour/contrib/gd/gd.prg b/harbour/contrib/hbgd/gd.prg similarity index 100% rename from harbour/contrib/gd/gd.prg rename to harbour/contrib/hbgd/gd.prg diff --git a/harbour/contrib/gd/gdbar.prg b/harbour/contrib/hbgd/gdbar.prg similarity index 100% rename from harbour/contrib/gd/gdbar.prg rename to harbour/contrib/hbgd/gdbar.prg diff --git a/harbour/contrib/gd/gdbarcod.prg b/harbour/contrib/hbgd/gdbarcod.prg similarity index 100% rename from harbour/contrib/gd/gdbarcod.prg rename to harbour/contrib/hbgd/gdbarcod.prg diff --git a/harbour/contrib/gd/gdchart.prg b/harbour/contrib/hbgd/gdchart.prg similarity index 100% rename from harbour/contrib/gd/gdchart.prg rename to harbour/contrib/hbgd/gdchart.prg diff --git a/harbour/contrib/gd/gdexternal.ch b/harbour/contrib/hbgd/gdexternal.ch similarity index 100% rename from harbour/contrib/gd/gdexternal.ch rename to harbour/contrib/hbgd/gdexternal.ch diff --git a/harbour/contrib/gd/gdimage.prg b/harbour/contrib/hbgd/gdimage.prg similarity index 100% rename from harbour/contrib/gd/gdimage.prg rename to harbour/contrib/hbgd/gdimage.prg diff --git a/harbour/contrib/gd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c similarity index 100% rename from harbour/contrib/gd/gdwrp.c rename to harbour/contrib/hbgd/gdwrp.c diff --git a/harbour/contrib/gd/include/entities.h b/harbour/contrib/hbgd/include/entities.h similarity index 100% rename from harbour/contrib/gd/include/entities.h rename to harbour/contrib/hbgd/include/entities.h diff --git a/harbour/contrib/gd/include/gd.h b/harbour/contrib/hbgd/include/gd.h similarity index 100% rename from harbour/contrib/gd/include/gd.h rename to harbour/contrib/hbgd/include/gd.h diff --git a/harbour/contrib/gd/include/gd_io.h b/harbour/contrib/hbgd/include/gd_io.h similarity index 100% rename from harbour/contrib/gd/include/gd_io.h rename to harbour/contrib/hbgd/include/gd_io.h diff --git a/harbour/contrib/gd/include/gdcache.h b/harbour/contrib/hbgd/include/gdcache.h similarity index 100% rename from harbour/contrib/gd/include/gdcache.h rename to harbour/contrib/hbgd/include/gdcache.h diff --git a/harbour/contrib/gd/include/gdfontg.h b/harbour/contrib/hbgd/include/gdfontg.h similarity index 100% rename from harbour/contrib/gd/include/gdfontg.h rename to harbour/contrib/hbgd/include/gdfontg.h diff --git a/harbour/contrib/gd/include/gdfontl.h b/harbour/contrib/hbgd/include/gdfontl.h similarity index 100% rename from harbour/contrib/gd/include/gdfontl.h rename to harbour/contrib/hbgd/include/gdfontl.h diff --git a/harbour/contrib/gd/include/gdfontmb.h b/harbour/contrib/hbgd/include/gdfontmb.h similarity index 100% rename from harbour/contrib/gd/include/gdfontmb.h rename to harbour/contrib/hbgd/include/gdfontmb.h diff --git a/harbour/contrib/gd/include/gdfonts.h b/harbour/contrib/hbgd/include/gdfonts.h similarity index 100% rename from harbour/contrib/gd/include/gdfonts.h rename to harbour/contrib/hbgd/include/gdfonts.h diff --git a/harbour/contrib/gd/include/gdfontt.h b/harbour/contrib/hbgd/include/gdfontt.h similarity index 100% rename from harbour/contrib/gd/include/gdfontt.h rename to harbour/contrib/hbgd/include/gdfontt.h diff --git a/harbour/contrib/gd/include/gdfx.h b/harbour/contrib/hbgd/include/gdfx.h similarity index 100% rename from harbour/contrib/gd/include/gdfx.h rename to harbour/contrib/hbgd/include/gdfx.h diff --git a/harbour/contrib/gd/include/gdhelpers.h b/harbour/contrib/hbgd/include/gdhelpers.h similarity index 100% rename from harbour/contrib/gd/include/gdhelpers.h rename to harbour/contrib/hbgd/include/gdhelpers.h diff --git a/harbour/contrib/gd/include/jisx0208.h b/harbour/contrib/hbgd/include/jisx0208.h similarity index 100% rename from harbour/contrib/gd/include/jisx0208.h rename to harbour/contrib/hbgd/include/jisx0208.h diff --git a/harbour/contrib/gd/include/wbmp.h b/harbour/contrib/hbgd/include/wbmp.h similarity index 100% rename from harbour/contrib/gd/include/wbmp.h rename to harbour/contrib/hbgd/include/wbmp.h diff --git a/harbour/contrib/gd/make_b32.bat b/harbour/contrib/hbgd/make_b32.bat similarity index 100% rename from harbour/contrib/gd/make_b32.bat rename to harbour/contrib/hbgd/make_b32.bat diff --git a/harbour/contrib/gd/make_vc.bat b/harbour/contrib/hbgd/make_vc.bat similarity index 100% rename from harbour/contrib/gd/make_vc.bat rename to harbour/contrib/hbgd/make_vc.bat diff --git a/harbour/contrib/gd/readme.txt b/harbour/contrib/hbgd/readme.txt similarity index 100% rename from harbour/contrib/gd/readme.txt rename to harbour/contrib/hbgd/readme.txt diff --git a/harbour/contrib/gd/tests/animgif.prg b/harbour/contrib/hbgd/tests/animgif.prg similarity index 100% rename from harbour/contrib/gd/tests/animgif.prg rename to harbour/contrib/hbgd/tests/animgif.prg diff --git a/harbour/contrib/gd/tests/antialiased.prg b/harbour/contrib/hbgd/tests/antialiased.prg similarity index 100% rename from harbour/contrib/gd/tests/antialiased.prg rename to harbour/contrib/hbgd/tests/antialiased.prg diff --git a/harbour/contrib/gd/tests/barms.prg b/harbour/contrib/hbgd/tests/barms.prg similarity index 100% rename from harbour/contrib/gd/tests/barms.prg rename to harbour/contrib/hbgd/tests/barms.prg diff --git a/harbour/contrib/gd/tests/bartest.prg b/harbour/contrib/hbgd/tests/bartest.prg similarity index 100% rename from harbour/contrib/gd/tests/bartest.prg rename to harbour/contrib/hbgd/tests/bartest.prg diff --git a/harbour/contrib/gd/tests/bldtest.bat b/harbour/contrib/hbgd/tests/bldtest.bat similarity index 100% rename from harbour/contrib/gd/tests/bldtest.bat rename to harbour/contrib/hbgd/tests/bldtest.bat diff --git a/harbour/contrib/gd/tests/bldtest.sh b/harbour/contrib/hbgd/tests/bldtest.sh similarity index 100% rename from harbour/contrib/gd/tests/bldtest.sh rename to harbour/contrib/hbgd/tests/bldtest.sh diff --git a/harbour/contrib/gd/tests/counter.prg b/harbour/contrib/hbgd/tests/counter.prg similarity index 100% rename from harbour/contrib/gd/tests/counter.prg rename to harbour/contrib/hbgd/tests/counter.prg diff --git a/harbour/contrib/gd/tests/digits/57chevy.gif b/harbour/contrib/hbgd/tests/digits/57chevy.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/57chevy.gif rename to harbour/contrib/hbgd/tests/digits/57chevy.gif diff --git a/harbour/contrib/gd/tests/digits/7seg.gif b/harbour/contrib/hbgd/tests/digits/7seg.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/7seg.gif rename to harbour/contrib/hbgd/tests/digits/7seg.gif diff --git a/harbour/contrib/gd/tests/digits/brsd.gif b/harbour/contrib/hbgd/tests/digits/brsd.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/brsd.gif rename to harbour/contrib/hbgd/tests/digits/brsd.gif diff --git a/harbour/contrib/gd/tests/digits/digib.gif b/harbour/contrib/hbgd/tests/digits/digib.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/digib.gif rename to harbour/contrib/hbgd/tests/digits/digib.gif diff --git a/harbour/contrib/gd/tests/digits/fdb.gif b/harbour/contrib/hbgd/tests/digits/fdb.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/fdb.gif rename to harbour/contrib/hbgd/tests/digits/fdb.gif diff --git a/harbour/contrib/gd/tests/digits/jelly.gif b/harbour/contrib/hbgd/tests/digits/jelly.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/jelly.gif rename to harbour/contrib/hbgd/tests/digits/jelly.gif diff --git a/harbour/contrib/gd/tests/digits/odb.gif b/harbour/contrib/hbgd/tests/digits/odb.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/odb.gif rename to harbour/contrib/hbgd/tests/digits/odb.gif diff --git a/harbour/contrib/gd/tests/digits/odw.gif b/harbour/contrib/hbgd/tests/digits/odw.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/odw.gif rename to harbour/contrib/hbgd/tests/digits/odw.gif diff --git a/harbour/contrib/gd/tests/digits/pdg.gif b/harbour/contrib/hbgd/tests/digits/pdg.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/pdg.gif rename to harbour/contrib/hbgd/tests/digits/pdg.gif diff --git a/harbour/contrib/gd/tests/digits/pdw.gif b/harbour/contrib/hbgd/tests/digits/pdw.gif similarity index 100% rename from harbour/contrib/gd/tests/digits/pdw.gif rename to harbour/contrib/hbgd/tests/digits/pdw.gif diff --git a/harbour/contrib/gd/tests/gdtest.prg b/harbour/contrib/hbgd/tests/gdtest.prg similarity index 100% rename from harbour/contrib/gd/tests/gdtest.prg rename to harbour/contrib/hbgd/tests/gdtest.prg diff --git a/harbour/contrib/gd/tests/gdtestcls.prg b/harbour/contrib/hbgd/tests/gdtestcls.prg similarity index 100% rename from harbour/contrib/gd/tests/gdtestcls.prg rename to harbour/contrib/hbgd/tests/gdtestcls.prg diff --git a/harbour/contrib/gd/tests/images_in/conv_test.jpeg b/harbour/contrib/hbgd/tests/images_in/conv_test.jpeg similarity index 100% rename from harbour/contrib/gd/tests/images_in/conv_test.jpeg rename to harbour/contrib/hbgd/tests/images_in/conv_test.jpeg diff --git a/harbour/contrib/gd/tests/images_in/gdlogobig.png b/harbour/contrib/hbgd/tests/images_in/gdlogobig.png similarity index 100% rename from harbour/contrib/gd/tests/images_in/gdlogobig.png rename to harbour/contrib/hbgd/tests/images_in/gdlogobig.png diff --git a/harbour/contrib/gd/tests/images_in/theclipper.gif b/harbour/contrib/hbgd/tests/images_in/theclipper.gif similarity index 100% rename from harbour/contrib/gd/tests/images_in/theclipper.gif rename to harbour/contrib/hbgd/tests/images_in/theclipper.gif diff --git a/harbour/contrib/gd/tests/images_out/EMPTY b/harbour/contrib/hbgd/tests/images_out/EMPTY similarity index 100% rename from harbour/contrib/gd/tests/images_out/EMPTY rename to harbour/contrib/hbgd/tests/images_out/EMPTY diff --git a/harbour/contrib/gd/tests/test_out.prg b/harbour/contrib/hbgd/tests/test_out.prg similarity index 100% rename from harbour/contrib/gd/tests/test_out.prg rename to harbour/contrib/hbgd/tests/test_out.prg diff --git a/harbour/contrib/gd/tests/testdpi.prg b/harbour/contrib/hbgd/tests/testdpi.prg similarity index 100% rename from harbour/contrib/gd/tests/testdpi.prg rename to harbour/contrib/hbgd/tests/testdpi.prg diff --git a/harbour/contrib/gd/tests/tostring.prg b/harbour/contrib/hbgd/tests/tostring.prg similarity index 100% rename from harbour/contrib/gd/tests/tostring.prg rename to harbour/contrib/hbgd/tests/tostring.prg diff --git a/harbour/contrib/directx/Makefile b/harbour/contrib/hbw32ddr/Makefile similarity index 84% rename from harbour/contrib/directx/Makefile rename to harbour/contrib/hbw32ddr/Makefile index 3f6841af4f..5802702a00 100644 --- a/harbour/contrib/directx/Makefile +++ b/harbour/contrib/hbw32ddr/Makefile @@ -9,6 +9,6 @@ C_SOURCES=\ PRG_SOURCES=\ -LIBNAME=hbwin32ddrw +LIBNAME=hbw32ddr include $(TOP)$(ROOT)config/lib.cf diff --git a/harbour/contrib/directx/common.mak b/harbour/contrib/hbw32ddr/common.mak similarity index 85% rename from harbour/contrib/directx/common.mak rename to harbour/contrib/hbw32ddr/common.mak index 4df4579e4c..f75a86ac96 100644 --- a/harbour/contrib/directx/common.mak +++ b/harbour/contrib/hbw32ddr/common.mak @@ -2,7 +2,7 @@ # $Id$ # -LIBNAME = hbwin32ddrw +LIBNAME = hbw32ddr LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT) diff --git a/harbour/contrib/directx/make_b32.bat b/harbour/contrib/hbw32ddr/make_b32.bat similarity index 100% rename from harbour/contrib/directx/make_b32.bat rename to harbour/contrib/hbw32ddr/make_b32.bat diff --git a/harbour/contrib/directx/make_vc.bat b/harbour/contrib/hbw32ddr/make_vc.bat similarity index 100% rename from harbour/contrib/directx/make_vc.bat rename to harbour/contrib/hbw32ddr/make_vc.bat diff --git a/harbour/contrib/directx/readme.txt b/harbour/contrib/hbw32ddr/readme.txt similarity index 100% rename from harbour/contrib/directx/readme.txt rename to harbour/contrib/hbw32ddr/readme.txt diff --git a/harbour/contrib/directx/test/anima2.bmp b/harbour/contrib/hbw32ddr/test/anima2.bmp similarity index 100% rename from harbour/contrib/directx/test/anima2.bmp rename to harbour/contrib/hbw32ddr/test/anima2.bmp diff --git a/harbour/contrib/directx/test/black.bmp b/harbour/contrib/hbw32ddr/test/black.bmp similarity index 100% rename from harbour/contrib/directx/test/black.bmp rename to harbour/contrib/hbw32ddr/test/black.bmp diff --git a/harbour/contrib/directx/test/brick1.bmp b/harbour/contrib/hbw32ddr/test/brick1.bmp similarity index 100% rename from harbour/contrib/directx/test/brick1.bmp rename to harbour/contrib/hbw32ddr/test/brick1.bmp diff --git a/harbour/contrib/directx/test/brick2.bmp b/harbour/contrib/hbw32ddr/test/brick2.bmp similarity index 100% rename from harbour/contrib/directx/test/brick2.bmp rename to harbour/contrib/hbw32ddr/test/brick2.bmp diff --git a/harbour/contrib/directx/test/brick3.bmp b/harbour/contrib/hbw32ddr/test/brick3.bmp similarity index 100% rename from harbour/contrib/directx/test/brick3.bmp rename to harbour/contrib/hbw32ddr/test/brick3.bmp diff --git a/harbour/contrib/directx/test/shot.bmp b/harbour/contrib/hbw32ddr/test/shot.bmp similarity index 100% rename from harbour/contrib/directx/test/shot.bmp rename to harbour/contrib/hbw32ddr/test/shot.bmp diff --git a/harbour/contrib/directx/test/testdx.prg b/harbour/contrib/hbw32ddr/test/testdx.prg similarity index 100% rename from harbour/contrib/directx/test/testdx.prg rename to harbour/contrib/hbw32ddr/test/testdx.prg diff --git a/harbour/contrib/directx/w32_ddrw.cpp b/harbour/contrib/hbw32ddr/w32_ddrw.cpp similarity index 100% rename from harbour/contrib/directx/w32_ddrw.cpp rename to harbour/contrib/hbw32ddr/w32_ddrw.cpp diff --git a/harbour/contrib/directx/w32_ddrw.h b/harbour/contrib/hbw32ddr/w32_ddrw.h similarity index 100% rename from harbour/contrib/directx/w32_ddrw.h rename to harbour/contrib/hbw32ddr/w32_ddrw.h diff --git a/harbour/contrib/hbzlib/License.txt b/harbour/contrib/hbziparch/License.txt similarity index 100% rename from harbour/contrib/hbzlib/License.txt rename to harbour/contrib/hbziparch/License.txt diff --git a/harbour/contrib/hbzlib/Linux/Makefile b/harbour/contrib/hbziparch/Linux/Makefile similarity index 100% rename from harbour/contrib/hbzlib/Linux/Makefile rename to harbour/contrib/hbziparch/Linux/Makefile diff --git a/harbour/contrib/hbzlib/Linux/ZipFileMapping.h b/harbour/contrib/hbziparch/Linux/ZipFileMapping.h similarity index 100% rename from harbour/contrib/hbzlib/Linux/ZipFileMapping.h rename to harbour/contrib/hbziparch/Linux/ZipFileMapping.h diff --git a/harbour/contrib/hbzlib/Linux/ZipPathComponent.cpp b/harbour/contrib/hbziparch/Linux/ZipPathComponent.cpp similarity index 100% rename from harbour/contrib/hbzlib/Linux/ZipPathComponent.cpp rename to harbour/contrib/hbziparch/Linux/ZipPathComponent.cpp diff --git a/harbour/contrib/hbzlib/Linux/ZipPlatform.cpp b/harbour/contrib/hbziparch/Linux/ZipPlatform.cpp similarity index 100% rename from harbour/contrib/hbzlib/Linux/ZipPlatform.cpp rename to harbour/contrib/hbziparch/Linux/ZipPlatform.cpp diff --git a/harbour/contrib/hbzlib/Makefile b/harbour/contrib/hbziparch/Makefile similarity index 100% rename from harbour/contrib/hbzlib/Makefile rename to harbour/contrib/hbziparch/Makefile diff --git a/harbour/contrib/hbzlib/ZipString.cpp b/harbour/contrib/hbziparch/ZipString.cpp similarity index 100% rename from harbour/contrib/hbzlib/ZipString.cpp rename to harbour/contrib/hbziparch/ZipString.cpp diff --git a/harbour/contrib/hbzlib/common.mak b/harbour/contrib/hbziparch/common.mak similarity index 100% rename from harbour/contrib/hbzlib/common.mak rename to harbour/contrib/hbziparch/common.mak diff --git a/harbour/contrib/hbzlib/doc/zipnew.txt b/harbour/contrib/hbziparch/doc/zipnew.txt similarity index 100% rename from harbour/contrib/hbzlib/doc/zipnew.txt rename to harbour/contrib/hbziparch/doc/zipnew.txt diff --git a/harbour/contrib/hbzlib/hbcomprs.c b/harbour/contrib/hbziparch/hbcomprs.c similarity index 100% rename from harbour/contrib/hbzlib/hbcomprs.c rename to harbour/contrib/hbziparch/hbcomprs.c diff --git a/harbour/contrib/hbzlib/include/ZipExport.h b/harbour/contrib/hbziparch/include/ZipExport.h similarity index 100% rename from harbour/contrib/hbzlib/include/ZipExport.h rename to harbour/contrib/hbziparch/include/ZipExport.h diff --git a/harbour/contrib/hbzlib/include/hbcomprs.h b/harbour/contrib/hbziparch/include/hbcomprs.h similarity index 100% rename from harbour/contrib/hbzlib/include/hbcomprs.h rename to harbour/contrib/hbziparch/include/hbcomprs.h diff --git a/harbour/contrib/hbzlib/include/hbz.h b/harbour/contrib/hbziparch/include/hbz.h similarity index 100% rename from harbour/contrib/hbzlib/include/hbz.h rename to harbour/contrib/hbziparch/include/hbz.h diff --git a/harbour/contrib/hbzlib/include/hbzip.h b/harbour/contrib/hbziparch/include/hbzip.h similarity index 100% rename from harbour/contrib/hbzlib/include/hbzip.h rename to harbour/contrib/hbziparch/include/hbzip.h diff --git a/harbour/contrib/hbzlib/include/hbzip2.h b/harbour/contrib/hbziparch/include/hbzip2.h similarity index 100% rename from harbour/contrib/hbzlib/include/hbzip2.h rename to harbour/contrib/hbziparch/include/hbzip2.h diff --git a/harbour/contrib/hbzlib/include/resource.h b/harbour/contrib/hbziparch/include/resource.h similarity index 100% rename from harbour/contrib/hbzlib/include/resource.h rename to harbour/contrib/hbziparch/include/resource.h diff --git a/harbour/contrib/hbzlib/include/stdafx.h b/harbour/contrib/hbziparch/include/stdafx.h similarity index 100% rename from harbour/contrib/hbzlib/include/stdafx.h rename to harbour/contrib/hbziparch/include/stdafx.h diff --git a/harbour/contrib/hbzlib/include/unzip.h b/harbour/contrib/hbziparch/include/unzip.h similarity index 100% rename from harbour/contrib/hbzlib/include/unzip.h rename to harbour/contrib/hbziparch/include/unzip.h diff --git a/harbour/contrib/hbzlib/include/zconf.h b/harbour/contrib/hbziparch/include/zconf.h similarity index 100% rename from harbour/contrib/hbzlib/include/zconf.h rename to harbour/contrib/hbziparch/include/zconf.h diff --git a/harbour/contrib/hbzlib/include/zip.h b/harbour/contrib/hbziparch/include/zip.h similarity index 100% rename from harbour/contrib/hbzlib/include/zip.h rename to harbour/contrib/hbziparch/include/zip.h diff --git a/harbour/contrib/hbzlib/include/zipabstractfile.h b/harbour/contrib/hbziparch/include/zipabstractfile.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipabstractfile.h rename to harbour/contrib/hbziparch/include/zipabstractfile.h diff --git a/harbour/contrib/hbzlib/include/ziparchive.h b/harbour/contrib/hbziparch/include/ziparchive.h similarity index 100% rename from harbour/contrib/hbzlib/include/ziparchive.h rename to harbour/contrib/hbziparch/include/ziparchive.h diff --git a/harbour/contrib/hbzlib/include/zipautobuffer.h b/harbour/contrib/hbziparch/include/zipautobuffer.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipautobuffer.h rename to harbour/contrib/hbziparch/include/zipautobuffer.h diff --git a/harbour/contrib/hbzlib/include/zipbaseexception.h b/harbour/contrib/hbziparch/include/zipbaseexception.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipbaseexception.h rename to harbour/contrib/hbziparch/include/zipbaseexception.h diff --git a/harbour/contrib/hbzlib/include/zipcentraldir.h b/harbour/contrib/hbziparch/include/zipcentraldir.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipcentraldir.h rename to harbour/contrib/hbziparch/include/zipcentraldir.h diff --git a/harbour/contrib/hbzlib/include/zipcollections.h b/harbour/contrib/hbziparch/include/zipcollections.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipcollections.h rename to harbour/contrib/hbziparch/include/zipcollections.h diff --git a/harbour/contrib/hbzlib/include/zipcompatibility.h b/harbour/contrib/hbziparch/include/zipcompatibility.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipcompatibility.h rename to harbour/contrib/hbziparch/include/zipcompatibility.h diff --git a/harbour/contrib/hbzlib/include/zipexception.h b/harbour/contrib/hbziparch/include/zipexception.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipexception.h rename to harbour/contrib/hbziparch/include/zipexception.h diff --git a/harbour/contrib/hbzlib/include/zipfile.h b/harbour/contrib/hbziparch/include/zipfile.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipfile.h rename to harbour/contrib/hbziparch/include/zipfile.h diff --git a/harbour/contrib/hbzlib/include/zipfileheader.h b/harbour/contrib/hbziparch/include/zipfileheader.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipfileheader.h rename to harbour/contrib/hbziparch/include/zipfileheader.h diff --git a/harbour/contrib/hbzlib/include/zipfilemapping.h b/harbour/contrib/hbziparch/include/zipfilemapping.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipfilemapping.h rename to harbour/contrib/hbziparch/include/zipfilemapping.h diff --git a/harbour/contrib/hbzlib/include/zipinternalinfo.h b/harbour/contrib/hbziparch/include/zipinternalinfo.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipinternalinfo.h rename to harbour/contrib/hbziparch/include/zipinternalinfo.h diff --git a/harbour/contrib/hbzlib/include/zipmemfile.h b/harbour/contrib/hbziparch/include/zipmemfile.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipmemfile.h rename to harbour/contrib/hbziparch/include/zipmemfile.h diff --git a/harbour/contrib/hbzlib/include/zippathcomponent.h b/harbour/contrib/hbziparch/include/zippathcomponent.h similarity index 100% rename from harbour/contrib/hbzlib/include/zippathcomponent.h rename to harbour/contrib/hbziparch/include/zippathcomponent.h diff --git a/harbour/contrib/hbzlib/include/zipplatform.h b/harbour/contrib/hbziparch/include/zipplatform.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipplatform.h rename to harbour/contrib/hbziparch/include/zipplatform.h diff --git a/harbour/contrib/hbzlib/include/zipstorage.h b/harbour/contrib/hbziparch/include/zipstorage.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipstorage.h rename to harbour/contrib/hbziparch/include/zipstorage.h diff --git a/harbour/contrib/hbzlib/include/zipstring.h b/harbour/contrib/hbziparch/include/zipstring.h similarity index 100% rename from harbour/contrib/hbzlib/include/zipstring.h rename to harbour/contrib/hbziparch/include/zipstring.h diff --git a/harbour/contrib/hbzlib/include/zutil.h b/harbour/contrib/hbziparch/include/zutil.h similarity index 100% rename from harbour/contrib/hbzlib/include/zutil.h rename to harbour/contrib/hbziparch/include/zutil.h diff --git a/harbour/contrib/hbzlib/lincompile.sh b/harbour/contrib/hbziparch/lincompile.sh similarity index 100% rename from harbour/contrib/hbzlib/lincompile.sh rename to harbour/contrib/hbziparch/lincompile.sh diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbziparch/make_b32.bat similarity index 100% rename from harbour/contrib/hbzlib/make_b32.bat rename to harbour/contrib/hbziparch/make_b32.bat diff --git a/harbour/contrib/hbzlib/make_b32_dll.bat b/harbour/contrib/hbziparch/make_b32_dll.bat similarity index 68% rename from harbour/contrib/hbzlib/make_b32_dll.bat rename to harbour/contrib/hbziparch/make_b32_dll.bat index 19e6708cda..3976962904 100644 --- a/harbour/contrib/hbzlib/make_b32_dll.bat +++ b/harbour/contrib/hbziparch/make_b32_dll.bat @@ -25,9 +25,9 @@ if not exist obj\dll\b32 md obj\dll\b32 :BUILD_OK if exist hdll.tmp del hdll.tmp - if exist ..\..\lib\b32\hbzipdll.dll implib ..\..\lib\b32\hbzipdll.lib ..\..\lib\b32\hbzipdll.dll > nul - if exist ..\..\lib\b32\hbzipdll.dll copy ..\..\lib\b32\hbzipdll.dll ..\..\lib > nul - if exist ..\..\lib\b32\hbzipdll.lib copy ..\..\lib\b32\hbzipdll.lib ..\..\lib > nul + if exist ..\..\lib\b32\hbziparchdll.dll implib ..\..\lib\b32\hbziparchdll.lib ..\..\lib\b32\hbziparchdll.dll > nul + if exist ..\..\lib\b32\hbziparchdll.dll copy ..\..\lib\b32\hbziparchdll.dll ..\..\lib > nul + if exist ..\..\lib\b32\hbziparchdll.lib copy ..\..\lib\b32\hbziparchdll.lib ..\..\lib > nul goto EXIT diff --git a/harbour/contrib/hbzlib/make_b32_dll.mak b/harbour/contrib/hbziparch/make_b32_dll.mak similarity index 96% rename from harbour/contrib/hbzlib/make_b32_dll.mak rename to harbour/contrib/hbziparch/make_b32_dll.mak index 07defe436d..a0be651faa 100644 --- a/harbour/contrib/hbzlib/make_b32_dll.mak +++ b/harbour/contrib/hbziparch/make_b32_dll.mak @@ -47,7 +47,7 @@ CLIBFLAGS = $(C_USR) -a8 -OS -O2 -6 -c -I$(INCLUDE_DIR) -d -w- -DZLIB_DLL # ßßßßßßßßßß # Please adjust according to your environment -HARBOUR_DLL = ..\..\lib\b32\hbzipdll.dll +HARBOUR_DLL = ..\..\lib\b32\hbziparchdll.dll # ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿ # ³ HARBOUR_DLL rules ³Û @@ -84,8 +84,8 @@ all: \ CLEAN: -@if exist $(HARBOUR_DLL) del $(HARBOUR_DLL) >nul - -@if exist ..\..\lib\b32\hbzipdll.tds del ..\..\lib\b32\hbzipdll.tds >nul - -@if exist ..\..\lib\b32\hbzipdll.map del ..\..\lib\b32\hbzipdll.map >nul + -@if exist ..\..\lib\b32\hbziparchdll.tds del ..\..\lib\b32\hbziparchdll.tds >nul + -@if exist ..\..\lib\b32\hbziparchdll.map del ..\..\lib\b32\hbziparchdll.map >nul -@if exist $(OBJ_DIR)\*.obj del $(OBJ_DIR)\*.obj >nul -@if exist $(OBJ_DIR)\*.c del $(OBJ_DIR)\*.c >nul -@if exist $(OBJ_DIR)\*.h del $(OBJ_DIR)\*.h >nul diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbziparch/make_vc.bat similarity index 100% rename from harbour/contrib/hbzlib/make_vc.bat rename to harbour/contrib/hbziparch/make_vc.bat diff --git a/harbour/contrib/hbzlib/stdafx.cpp b/harbour/contrib/hbziparch/stdafx.cpp similarity index 100% rename from harbour/contrib/hbzlib/stdafx.cpp rename to harbour/contrib/hbziparch/stdafx.cpp diff --git a/harbour/contrib/hbzlib/zip.c b/harbour/contrib/hbziparch/zip.c similarity index 100% rename from harbour/contrib/hbzlib/zip.c rename to harbour/contrib/hbziparch/zip.c diff --git a/harbour/contrib/hbzlib/ziparchive.cpp b/harbour/contrib/hbziparch/ziparchive.cpp similarity index 100% rename from harbour/contrib/hbzlib/ziparchive.cpp rename to harbour/contrib/hbziparch/ziparchive.cpp diff --git a/harbour/contrib/hbzlib/zipautobuffer.cpp b/harbour/contrib/hbziparch/zipautobuffer.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipautobuffer.cpp rename to harbour/contrib/hbziparch/zipautobuffer.cpp diff --git a/harbour/contrib/hbzlib/zipcentraldir.cpp b/harbour/contrib/hbziparch/zipcentraldir.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipcentraldir.cpp rename to harbour/contrib/hbziparch/zipcentraldir.cpp diff --git a/harbour/contrib/hbzlib/zipcomp.cpp b/harbour/contrib/hbziparch/zipcomp.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipcomp.cpp rename to harbour/contrib/hbziparch/zipcomp.cpp diff --git a/harbour/contrib/hbzlib/zipcompatibility.cpp b/harbour/contrib/hbziparch/zipcompatibility.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipcompatibility.cpp rename to harbour/contrib/hbziparch/zipcompatibility.cpp diff --git a/harbour/contrib/hbzlib/zipexception.cpp b/harbour/contrib/hbziparch/zipexception.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipexception.cpp rename to harbour/contrib/hbziparch/zipexception.cpp diff --git a/harbour/contrib/hbzlib/zipfile.cpp b/harbour/contrib/hbziparch/zipfile.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipfile.cpp rename to harbour/contrib/hbziparch/zipfile.cpp diff --git a/harbour/contrib/hbzlib/zipfileheader.cpp b/harbour/contrib/hbziparch/zipfileheader.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipfileheader.cpp rename to harbour/contrib/hbziparch/zipfileheader.cpp diff --git a/harbour/contrib/hbzlib/zipmemfile.cpp b/harbour/contrib/hbziparch/zipmemfile.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipmemfile.cpp rename to harbour/contrib/hbziparch/zipmemfile.cpp diff --git a/harbour/contrib/hbzlib/zipnew.cpp b/harbour/contrib/hbziparch/zipnew.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipnew.cpp rename to harbour/contrib/hbziparch/zipnew.cpp diff --git a/harbour/contrib/hbzlib/zippathcomponent.cpp b/harbour/contrib/hbziparch/zippathcomponent.cpp similarity index 100% rename from harbour/contrib/hbzlib/zippathcomponent.cpp rename to harbour/contrib/hbziparch/zippathcomponent.cpp diff --git a/harbour/contrib/hbzlib/zipplatform.cpp b/harbour/contrib/hbziparch/zipplatform.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipplatform.cpp rename to harbour/contrib/hbziparch/zipplatform.cpp diff --git a/harbour/contrib/hbzlib/zipplatformcomm.cpp b/harbour/contrib/hbziparch/zipplatformcomm.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipplatformcomm.cpp rename to harbour/contrib/hbziparch/zipplatformcomm.cpp diff --git a/harbour/contrib/hbzlib/zipstorage.cpp b/harbour/contrib/hbziparch/zipstorage.cpp similarity index 100% rename from harbour/contrib/hbzlib/zipstorage.cpp rename to harbour/contrib/hbziparch/zipstorage.cpp diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index 4f01bcd58f..4138f7ca4c 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -10,17 +10,17 @@ set HB_SHOW_ERRORS=no rem set DO_NOT_COMPILE=examples hbclip hgf what32 -set _HB_DIRS=adordd bmdbfcdx btree gtwvg libct libgt libmisc libnf msql +set _HB_DIRS=adordd bmdbfcdx hbbtree gtwvg libct libgt libmisc libnf msql for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=ole hbzlib htmllib odbc telepath tip win32 xhb +set _HB_DIRS=ole hbziparch htmllib odbc telepath tip win32 xhb for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=samples directx +set _HB_DIRS=samples hbw32ddr if not "%APOLLO_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo -if not "%FIREBIRD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% firebird -if not "%FREEIMAGE_DIR%" == "" set _HB_DIRS=%_HB_DIRS% freeimage -if not "%GD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% gd +if not "%FIREBIRD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird +if not "%FREEIMAGE_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage +if not "%GD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbgd if not "%MYSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% mysql if not "%PDFLIB_DIR%" == "" set _HB_DIRS=%_HB_DIRS% pdflib if not "%PGSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% pgsql diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index cceff050b6..009d08b947 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -10,17 +10,17 @@ set HB_SHOW_ERRORS=no rem set DO_NOT_COMPILE=examples hbclip hgf -set _HB_DIRS=adordd bmdbfcdx btree gtwvg libct libgt libmisc libnf msql +set _HB_DIRS=adordd bmdbfcdx hbbtree gtwvg libct libgt libmisc libnf msql for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=ole hbzlib htmllib odbc telepath tip what32 win32 xhb +set _HB_DIRS=ole hbziparch htmllib odbc telepath tip what32 win32 xhb for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=samples directx +set _HB_DIRS=samples hbw32ddr if not "%APOLLO_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbapollo -if not "%FIREBIRD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% firebird -if not "%FREEIMAGE_DIR%" == "" set _HB_DIRS=%_HB_DIRS% freeimage -if not "%GD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% gd +if not "%FIREBIRD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbfbird +if not "%FREEIMAGE_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbfimage +if not "%GD_DIR%" == "" set _HB_DIRS=%_HB_DIRS% hbgd if not "%MYSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% mysql if not "%PDFLIB_DIR%" == "" set _HB_DIRS=%_HB_DIRS% pdflib if not "%PGSQL_DIR%" == "" set _HB_DIRS=%_HB_DIRS% pgsql