diff options
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/demo/makefile | 5 | ||||
| -rw-r--r-- | core/src/tbox/makefile | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/src/demo/makefile b/core/src/demo/makefile index d49606341..b01fa0ded 100644 --- a/core/src/demo/makefile +++ b/core/src/demo/makefile @@ -13,8 +13,11 @@ demo_C_FILES += xmake # packages demo_PKGS-$(BASE) += base +# debug suffix +tbox_DTYPE := $(if $(findstring tbox,$(base_LIBNAMES)),,$(DTYPE)) + # others -demo_LIBS += xmake$(DTYPE) lcurses$(DTYPE) tbox$(DTYPE) luajit$(DTYPE) sv$(DTYPE) lua-cjson$(DTYPE) $(BASE_LIBS) +demo_LIBS += xmake$(DTYPE) lcurses$(DTYPE) tbox$(tbox_DTYPE) luajit$(DTYPE) sv$(DTYPE) lua-cjson$(DTYPE) $(BASE_LIBS) demo_INC_DIRS += ../ ../tbox/tbox/src ../tbox/inc/$(PLAT) ../luajit/luajit/src ../sv/sv/include demo_LIB_DIRS += ../xmake ../tbox ../luajit ../sv ../lcurses ../lua-cjson demo_CXFLAGS += -D__tb_prefix__=\"xmake\" diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile index 1de99cd28..f24303eb1 100644 --- a/core/src/tbox/makefile +++ b/core/src/tbox/makefile @@ -302,6 +302,11 @@ tbox_INC_DIRS += \ tbox/src \ inc/$(PLAT) +# use system tbox library? +tbox_C_FILES := $(if $(findstring tbox,$(base_LIBNAMES)),,$(tbox_C_FILES)) +tbox_M_FILES := $(if $(findstring tbox,$(base_LIBNAMES)),,$(tbox_M_FILES)) +tbox_INC_FILES := $(if $(findstring tbox,$(base_LIBNAMES)),,$(tbox_INC_FILES)) + # suffix include $(PRO_DIR)/suffix.mak |