fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-03-27 15:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* external/sqlite3/Makefile
    * Don't build it for linux and darwin.

  * contrib/hbsqlit3/Makefile
    * Changed to plain standard external dependency search method.
    + Added searching in local sqlite3 copy for win and os2.
This commit is contained in:
Viktor Szakats
2009-03-27 14:36:28 +00:00
parent cd295ba8c8
commit ed9059b8f8
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -8,6 +8,14 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-27 15:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* external/sqlite3/Makefile
* Don't build it for linux and darwin.
* contrib/hbsqlit3/Makefile
* Changed to plain standard external dependency search method.
+ Added searching in local sqlite3 copy for win and os2.
2009-03-27 15:01 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbodbc/odbc.c
! Fixed potential buffer overrun in SQLDRIVERCONNECT() in UNICODE mode.

26
harbour/contrib/hbsqlit3/Makefile
View File

@@ -6,32 +6,20 @@ ROOT = ../../
LIBNAME=hbsqlit3
ifeq ($(HB_WITHOUT_SQLIT3),)
ifeq ($(HB_ARCHITECTURE),dos)
HB_WITHOUT_SQLIT3=yes
endif
ifeq ($(HB_ARCHITECTURE),bsd)
HB_WITHOUT_SQLIT3=yes
endif
ifeq ($(HB_ARCHITECTURE),hpux)
HB_WITHOUT_SQLIT3=yes
endif
endif
ifneq ($(HB_WITHOUT_SQLIT3),yes)
HB_INC_SQLITE3_OK =
ifeq ($(HB_INC_SQLITE3),)
ifeq ($(HB_XBUILD),)
HB_INC_SQLITE3 = /usr/include $(TOP)$(ROOT)/external/sqlite3
HB_INC_SQLITE3 = /usr/include
ifeq ($(HB_ARCHITECTURE),win)
HB_INC_SQLITE3 += $(TOP)$(ROOT)/external/sqlite3
endif
ifeq ($(HB_ARCHITECTURE),os2)
HB_INC_SQLITE3 += $(TOP)$(ROOT)/external/sqlite3
endif
endif
endif
HB_INC_SQLITE3_OK += $(foreach d, $(HB_INC_SQLITE3), $(if $(wildcard $(d)/sqlite3.h),$(d),))
endif
ifneq ($(strip $(HB_INC_SQLITE3_OK)),)
HB_USER_CFLAGS += $(foreach d, $(HB_INC_SQLITE3_OK), -I$(d))

6
harbour/external/sqlite3/Makefile vendored
View File

@@ -16,6 +16,12 @@ endif
ifeq ($(HB_ARCHITECTURE),hpux)
HB_WITHOUT_SQLIT3=yes
endif
ifeq ($(HB_ARCHITECTURE),linux)
HB_WITHOUT_SQLIT3=yes
endif
ifeq ($(HB_ARCHITECTURE),darwin)
HB_WITHOUT_SQLIT3=yes
endif
endif
ifneq ($(HB_WITHOUT_SQLIT3),yes)