diff options
| author | ruki <[email protected]> | 2021-06-29 00:29:55 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-06-29 00:29:55 +0800 |
| commit | 3cc1a70d719794fe629552a52a00e0d8095efc17 (patch) | |
| tree | 048f7b3ff8f2169313ad8a61a2471bcf54a56edd | |
| parent | 55ebccf6abe6317ec8d43fe2956c01535273242f (diff) | |
improve makefile
| -rw-r--r-- | core/src/demo/makefile | 18 | ||||
| -rw-r--r-- | core/src/lua-cjson/makefile | 2 | ||||
| -rw-r--r-- | core/src/luajit/makefile | 2 | ||||
| -rw-r--r-- | core/src/sv/makefile | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/core/src/demo/makefile b/core/src/demo/makefile index d576cd93e..4ee62ff81 100644 --- a/core/src/demo/makefile +++ b/core/src/demo/makefile @@ -34,18 +34,18 @@ demo_INC_DIRS += $(LUAJIT_INC_DIRS) demo_LIB_DIRS += $(LUAJIT_LIB_DIRS) # sv -ifndef LIBSV_LIBS -LIBSV_LIBS := sv$(DTYPE) +ifndef SV_LIBS +SV_LIBS := sv$(DTYPE) endif -ifndef LIBSV_INC_DIRS -LIBSV_INC_DIRS := ../sv/sv/include +ifndef SV_INC_DIRS +SV_INC_DIRS := ../sv/sv/include endif -ifndef LIBSV_LIB_DIRS -LIBSV_LIB_DIRS := ../sv +ifndef SV_LIB_DIRS +SV_LIB_DIRS := ../sv endif -demo_LIBS += $(LIBSV_LIBS) -demo_INC_DIRS += $(LIBSV_INC_DIRS) -demo_LIB_DIRS += $(LIBSV_LIB_DIRS) +demo_LIBS += $(SV_LIBS) +demo_INC_DIRS += $(SV_INC_DIRS) +demo_LIB_DIRS += $(SV_LIB_DIRS) # lua-cjson ifndef LUA_CJSON_LIBS diff --git a/core/src/lua-cjson/makefile b/core/src/lua-cjson/makefile index 9d45a3bd4..8a95507ba 100644 --- a/core/src/lua-cjson/makefile +++ b/core/src/lua-cjson/makefile @@ -25,7 +25,7 @@ lua-cjson_CFLAGS += -DNDEBUG -DUSE_INTERNAL_FPCONV lua-cjson_INC_DIRS += \ ../luajit/luajit/src -# use system luajit library? +# use given lua-cjson library? ifdef LUA_CJSON_LIBS lua-cjson_C_FILES := lua-cjson_INC_DIRS := diff --git a/core/src/luajit/makefile b/core/src/luajit/makefile index fc05a2883..2fbfe89b9 100644 --- a/core/src/luajit/makefile +++ b/core/src/luajit/makefile @@ -137,7 +137,7 @@ luajit_CXFLAGS += -fPIE endif endif -# use system luajit library? +# use given luajit library? ifdef LUAJIT_LIBS luajit_C_FILES := luajit_ASM_FILES := diff --git a/core/src/sv/makefile b/core/src/sv/makefile index 535f4c0b0..2666676a2 100644 --- a/core/src/sv/makefile +++ b/core/src/sv/makefile @@ -23,8 +23,8 @@ sv_C_FILES += \ # includes sv_INC_DIRS += sv/include -# use system luajit library? -ifdef LIBSV_LIBS +# use given sv library? +ifdef SV_LIBS sv_C_FILES := sv_INC_DIRS := endif |