Skip to content

Commit

Permalink
rename submodules name
Browse files Browse the repository at this point in the history
  • Loading branch information
@waruqi
waruqi committed Jun 27, 2019
1 parent 10f5a0c commit 19cbd06
Show file tree
Hide file tree
Showing 15 changed files with 336 additions and 336 deletions.
16 changes: 8 additions & 8 deletions .gitmodules
View file
@@ -1,12 +1,12 @@
[submodule "core/src/tbox/repo"]
path = core/src/tbox/repo
[submodule "core/src/tbox/tbox"]
path = core/src/tbox/tbox
url = ../../tboox/tbox.git
[submodule "core/src/luajit/repo"]
path = core/src/luajit/repo
[submodule "core/src/luajit/luajit"]
path = core/src/luajit/luajit
url = ../../xmake-io/xmake-core-luajit.git
[submodule "core/src/sv/repo"]
path = core/src/sv/repo
[submodule "core/src/sv/sv"]
path = core/src/sv/sv
url = ../../xmake-io/xmake-core-sv.git
[submodule "core/src/pdcurses/repo"]
path = core/src/pdcurses/repo
[submodule "core/src/pdcurses/pdcurses"]
path = core/src/pdcurses/pdcurses
url = ../../xmake-io/xmake-core-pdcurses.git
2 changes: 1 addition & 1 deletion core/src/demo/makefile
View file
Expand Up @@ -15,7 +15,7 @@ demo_PKGS-$(BASE) += base

# others
demo_LIBS += xmake$(DTYPE) lcurses$(DTYPE) tbox$(DTYPE) luajit$(DTYPE) sv$(DTYPE)
demo_INC_DIRS += ../ ../tbox/repo/src ../tbox/inc/$(PLAT) ../luajit/repo/src ../sv/repo/include
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\"

Expand Down
2 changes: 1 addition & 1 deletion core/src/lcurses/makefile
View file
Expand Up @@ -17,7 +17,7 @@ lcurses_C_FILES += lcurses
lcurses_CXFLAGS += $(if $(findstring curses,$(base_LIBNAMES)),-DXM_CONFIG_API_HAVE_CURSES,)

# includes
lcurses_INC_DIRS += ../luajit/repo/src
lcurses_INC_DIRS += ../luajit/luajit/src

# suffix
include $(PRO_DIR)/suffix.mak
Expand Down
0 core/src/luajit/repo → core/src/luajit/luajit
Submodule luajit updated from 000000 to d1ea93
130 changes: 65 additions & 65 deletions core/src/luajit/makefile
View file
Expand Up @@ -12,71 +12,71 @@ luajit_CONFIG = n

# core files
luajit_C_FILES += \
repo/src/lib_aux \
repo/src/lib_base \
repo/src/lib_bit \
repo/src/lib_debug \
repo/src/lib_ffi \
repo/src/lib_init \
repo/src/lib_io \
repo/src/lib_jit \
repo/src/lib_math \
repo/src/lib_os \
repo/src/lib_package \
repo/src/lib_string \
repo/src/lib_table \
repo/src/lj_alloc \
repo/src/lj_api \
repo/src/lj_asm \
repo/src/lj_bc \
repo/src/lj_bcread \
repo/src/lj_bcwrite \
repo/src/lj_carith \
repo/src/lj_ccall \
repo/src/lj_ccallback \
repo/src/lj_cconv \
repo/src/lj_cdata \
repo/src/lj_char \
repo/src/lj_clib \
repo/src/lj_cparse \
repo/src/lj_crecord \
repo/src/lj_ctype \
repo/src/lj_debug \
repo/src/lj_dispatch \
repo/src/lj_err \
repo/src/lj_ffrecord \
repo/src/lj_func \
repo/src/lj_gc \
repo/src/lj_gdbjit \
repo/src/lj_ir \
repo/src/lj_lex \
repo/src/lj_lib \
repo/src/lj_load \
repo/src/lj_mcode \
repo/src/lj_meta \
repo/src/lj_obj \
repo/src/lj_opt_dce \
repo/src/lj_opt_fold \
repo/src/lj_opt_loop \
repo/src/lj_opt_mem \
repo/src/lj_opt_narrow \
repo/src/lj_opt_sink \
repo/src/lj_opt_split \
repo/src/lj_parse \
repo/src/lj_record \
repo/src/lj_snap \
repo/src/lj_state \
repo/src/lj_str \
repo/src/lj_strscan \
repo/src/lj_tab \
repo/src/lj_trace \
repo/src/lj_udata \
repo/src/lj_vmevent \
repo/src/lj_vmmath \
repo/src/lj_buf \
repo/src/lj_strfmt \
repo/src/lj_strfmt_num \
repo/src/lj_profile
luajit/src/lib_aux \
luajit/src/lib_base \
luajit/src/lib_bit \
luajit/src/lib_debug \
luajit/src/lib_ffi \
luajit/src/lib_init \
luajit/src/lib_io \
luajit/src/lib_jit \
luajit/src/lib_math \
luajit/src/lib_os \
luajit/src/lib_package \
luajit/src/lib_string \
luajit/src/lib_table \
luajit/src/lj_alloc \
luajit/src/lj_api \
luajit/src/lj_asm \
luajit/src/lj_bc \
luajit/src/lj_bcread \
luajit/src/lj_bcwrite \
luajit/src/lj_carith \
luajit/src/lj_ccall \
luajit/src/lj_ccallback \
luajit/src/lj_cconv \
luajit/src/lj_cdata \
luajit/src/lj_char \
luajit/src/lj_clib \
luajit/src/lj_cparse \
luajit/src/lj_crecord \
luajit/src/lj_ctype \
luajit/src/lj_debug \
luajit/src/lj_dispatch \
luajit/src/lj_err \
luajit/src/lj_ffrecord \
luajit/src/lj_func \
luajit/src/lj_gc \
luajit/src/lj_gdbjit \
luajit/src/lj_ir \
luajit/src/lj_lex \
luajit/src/lj_lib \
luajit/src/lj_load \
luajit/src/lj_mcode \
luajit/src/lj_meta \
luajit/src/lj_obj \
luajit/src/lj_opt_dce \
luajit/src/lj_opt_fold \
luajit/src/lj_opt_loop \
luajit/src/lj_opt_mem \
luajit/src/lj_opt_narrow \
luajit/src/lj_opt_sink \
luajit/src/lj_opt_split \
luajit/src/lj_parse \
luajit/src/lj_record \
luajit/src/lj_snap \
luajit/src/lj_state \
luajit/src/lj_str \
luajit/src/lj_strscan \
luajit/src/lj_tab \
luajit/src/lj_trace \
luajit/src/lj_udata \
luajit/src/lj_vmevent \
luajit/src/lj_vmmath \
luajit/src/lj_buf \
luajit/src/lj_strfmt \
luajit/src/lj_strfmt_num \
luajit/src/lj_profile

# asm files
ifeq ($(PLAT),windows)
Expand Down
6 changes: 3 additions & 3 deletions core/src/luajit/xmake.lua
View file
Expand Up @@ -21,14 +21,14 @@ target("luajit")
end

-- add header files
add_headerfiles("repo/src/(*.h)")
add_headerfiles("luajit/src/(*.h)")

-- add include directories
add_includedirs(autogendir)
add_includedirs("repo/src", {public = true})
add_includedirs("luajit/src", {public = true})

-- add the common source files
add_files("repo/src/*.c|ljamalg.c|luajit.c")
add_files("luajit/src/*.c|ljamalg.c|luajit.c")
if is_plat("windows") then
add_files(autogendir .. "/lj_vm.obj")
else
Expand Down
0 core/src/pdcurses/repo → core/src/pdcurses/pdcurses
Submodule pdcurses updated from 000000 to 46d2c8
4 changes: 2 additions & 2 deletions core/src/pdcurses/xmake.lua
View file
Expand Up @@ -5,10 +5,10 @@ target("pdcurses")
set_kind("static")

-- add includes directory
add_includedirs("repo", {public = true})
add_includedirs("pdcurses", {public = true})

-- add the common source files
add_files("repo/pdcurses/*.c", "repo/win32/*.c")
add_files("pdcurses/pdcurses/*.c", "pdcurses/win32/*.c")

-- add defines
add_defines("PDC_WIDE")
Expand Down
16 changes: 8 additions & 8 deletions core/src/sv/makefile
View file
Expand Up @@ -12,16 +12,16 @@ sv_CONFIG = n

# core files
sv_C_FILES += \
repo/src/comp \
repo/src/id \
repo/src/num \
repo/src/range \
repo/src/semvers \
repo/src/utils \
repo/src/version
sv/src/comp \
sv/src/id \
sv/src/num \
sv/src/range \
sv/src/semvers \
sv/src/utils \
sv/src/version

# includes
sv_INC_DIRS += repo/include
sv_INC_DIRS += sv/include


# suffix
Expand Down
0 core/src/sv/repo → core/src/sv/sv
Submodule sv updated from 000000 to b991eb
2 changes: 1 addition & 1 deletion core/src/sv/xmake.lua
View file
@@ -1 +1 @@
includes("repo")
includes("sv")

0 comments on commit 19cbd06

Please sign in to comment.