diff options
| author | Alexander <alex@cogarr.net> | 2019-01-10 20:49:14 -0500 |
|---|---|---|
| committer | Alexander <alex@cogarr.net> | 2019-01-10 20:49:14 -0500 |
| commit | b7d3b6e10542a2f05b64d0fccb5f038a7edba393 (patch) | |
| tree | 51d994203a76c17f479733a3f9fdda595d92c71a | |
| parent | c11bdb86f6759f6b68bd03cc1338e9cc8ebac282 (diff) | |
| download | brokengine-b7d3b6e10542a2f05b64d0fccb5f038a7edba393.tar.gz brokengine-b7d3b6e10542a2f05b64d0fccb5f038a7edba393.tar.bz2 brokengine-b7d3b6e10542a2f05b64d0fccb5f038a7edba393.zip | |
Finished cleaning up merge
| -rw-r--r-- | Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -266,11 +266,7 @@ $(BIN_DIR)/$(SERVERNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA) $(CP) $^ $@ $(LLUADIR)/src/libluajit$(STA_LIB_EXT) : $(LLUADIR)/src/Makefile -<<<<<<< HEAD - $(CP) $(LLUADIR)/src && make "BUILDMODE= static" -======= cd $(LLUADIR)/src && $(MAKE) $(LUAJIT_ARGS) "BUILDMODE= static" ->>>>>>> 3623bc70af309d1823c664a8129956da6c0e9c4a $(LIB_S_LUA) : $(LLUADIR)/src/libluajit$(STA_LIB_EXT) $(CP) $^ $@ |