diff options
| author | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@debian.org> | 2016-01-27 13:11:31 -0800 |
| commit | 02819db3483514d49df7ec3f7e372b5aeb831466 (patch) | |
| tree | 6a86adac74beac293bc688dafcfa1709a6476901 /src/lua/CMakeLists.txt | |
| parent | 2a61dffe127e22c1aaf955db6f085ac2eefbebba (diff) | |
| parent | 6f6de67c70fd98815088ce49f046f48f88ea35bd (diff) | |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@debian.org>
# Conflicts:
# src/CMakeLists.txt
# src/config.h
# src/lua/llimits.h
Diffstat (limited to 'src/lua/CMakeLists.txt')
| -rw-r--r-- | src/lua/CMakeLists.txt | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/lua/CMakeLists.txt b/src/lua/CMakeLists.txt deleted file mode 100644 index df2b30e7..00000000 --- a/src/lua/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -ADD_LIBRARY (lua STATIC - lapi.c lcode.c ldebug.c ldo.c lfunc.c lgc.c - llex.c lmem.c lobject.c lparser.c lstate.c lstring.c - ltable.c ltests.c ltm.c lundump.c lvm.c lzio.c - lauxlib.c lbaselib.c ldblib.c liolib.c lstrlib.c - tolua_lb.c tolua_rg.c tolua_tt.c tolua_tm.c tolua_gp.c - tolua_eh.c tolua_bd.c) - -ADD_EXECUTABLE(tolua tolua.c tolualua.c lua) - -TARGET_LINK_LIBRARIES(tolua lua) |