2009-08-27 18:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* config/linux/sunpro.mk
    + Setting CXX for linux/sunpro.mk to make it build .cpp files
      without forcing cpp mode explicitly. (suncc seems to do nothing
      with .cpp input files.)
      Same fix for sunos/sunpro?

  * config/rules.mk
    + Added option to override C++ compiler tool name with
      $(CXX) variable.

  * external/sqlite3/Makefile
  * external/libpng/Makefile
    * Formatting/cleanup.
This commit is contained in:
Viktor Szakats
2009-08-27 16:20:34 +00:00
parent 5f71a149ba
commit 4e93ea8ec2
5 changed files with 65 additions and 47 deletions

View File

@@ -6,20 +6,13 @@ ROOT := ../../
include $(TOP)$(ROOT)config/global.mk
LIBNAME := sqlite3
HB_BUILD_WARN := no
HB_BUILD_MODE := c
ifeq ($(HB_PLATFORM),wce)
HB_CFLAGS += -D_WIN32_WCE
endif
ifeq ($(HB_PLATFORM),dos)
# DJGPP and OpenWatcom in DOS aren't correctly recognized by SQLite,
# so we're forcing the next best available option. This will cause missing
# externals though. [vszakats]
HB_CFLAGS += -DSQLITE_OS_OTHER
endif
LIBNAME := sqlite3
C_SOURCES := \
sqlite3.c \
ifeq ($(HB_WITH_SQLITE3),)
ifeq ($(HB_PLATFORM),win)
@@ -48,12 +41,18 @@ endif
ifeq ($(HB_WITH_SQLITE3),yes)
C_SOURCES := \
sqlite3.c \
include $(TOP)$(ROOT)config/lib.mk
ifeq ($(HB_PLATFORM),wce)
HB_CFLAGS += -D_WIN32_WCE
endif
ifeq ($(HB_PLATFORM),dos)
# DJGPP and OpenWatcom in DOS aren't correctly recognized by SQLite,
# so we're forcing the next best available option. This will cause missing
# externals though. [vszakats]
HB_CFLAGS += -DSQLITE_OS_OTHER
endif
include $(TOP)$(ROOT)config/lib.mk
else
HB_SKIP_REASON := not supported or disabled
include $(TOP)$(ROOT)config/none.mk
HB_SKIP_REASON := not supported or disabled
include $(TOP)$(ROOT)config/none.mk
endif