diff options
| author | ruki <[email protected]> | 2020-02-10 23:49:21 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-02-10 16:56:08 +0800 |
| commit | 91b153126ec824195bb45b38f04e07ff9cba3029 (patch) | |
| tree | 243c43af1d4d7e23fdf877d4bc95642bc114d51b /core/src | |
| parent | 84f264409c95ace58e7fde0a7ed50103a604edad (diff) | |
update makefile
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/demo/makefile | 2 | ||||
| -rw-r--r-- | core/src/tbox/makefile | 13 | ||||
| m--------- | core/src/tbox/tbox | 0 | ||||
| -rw-r--r-- | core/src/xmake/makefile | 8 |
4 files changed, 21 insertions, 2 deletions
diff --git a/core/src/demo/makefile b/core/src/demo/makefile index a9c22a0e5..4ab0e2dba 100644 --- a/core/src/demo/makefile +++ b/core/src/demo/makefile @@ -14,7 +14,7 @@ demo_C_FILES += xmake demo_PKGS-$(BASE) += base # others -demo_LIBS += xmake$(DTYPE) lcurses$(DTYPE) tbox$(DTYPE) luajit$(DTYPE) sv$(DTYPE) +demo_LIBS += xmake$(DTYPE) lcurses$(DTYPE) tbox$(DTYPE) luajit$(DTYPE) sv$(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 demo_CXFLAGS += -D__tb_prefix__=\"xmake\" diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile index ac392519d..0cb17660b 100644 --- a/core/src/tbox/makefile +++ b/core/src/tbox/makefile @@ -265,6 +265,19 @@ tbox_C_FILES += \ tbox/src/tbox/charset/ucs4 \ tbox/src/tbox/charset/iso8859 +ifeq ($(PLAT),mingw) +tbox_C_FILES += \ + tbox/src/tbox/platform/windows/windows \ + tbox/src/tbox/platform/windows/iocp_object \ + tbox/src/tbox/platform/windows/socket_pool \ + tbox/src/tbox/platform/windows/interface/ws2_32 \ + tbox/src/tbox/platform/windows/interface/shell32 \ + tbox/src/tbox/platform/windows/interface/mswsock \ + tbox/src/tbox/platform/windows/interface/kernel32 \ + tbox/src/tbox/platform/windows/interface/iphlpapi \ + tbox/src/tbox/platform/windows/interface/interface +endif + # includes tbox_INC_DIRS += \ tbox/src \ diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox -Subproject eee53fcd0a8886ff381e9f3a2d7240b726a04bd +Subproject 1c2fb0e4b972d5571ed3c6246e84ff168d64400 diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile index 37016d54d..26915fa39 100644 --- a/core/src/xmake/makefile +++ b/core/src/xmake/makefile @@ -112,7 +112,13 @@ xmake_C_FILES += \ readline/history_list \ readline/add_history \ readline/clear_history - + +ifeq ($(PLAT),mingw) +xmake_C_FILES += \ + winos/ansi \ + winos/logical_drives \ + winos/registry_query +endif # flags xmake_CXFLAGS += -D__tb_prefix__=\"xmake\" |