Skip to content

Commit

Permalink
adding some features (reload, load )
Browse files Browse the repository at this point in the history
  • Loading branch information
Mr0maks committed Jul 17, 2019
1 parent 3639ccd commit 8630fa7
Show file tree
Hide file tree
Showing 209 changed files with 86,316 additions and 84,500 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@
#lua
*.lua
*.luac

#Qt creator
*.autosave
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ HLSDK = include/hlsdk
HLSDK_XASH3D = include/hlsdk-xash3d
METAMOD = include/metamod
LUAMOD_API = include/luamod
LUA = luajit/src/
LUA = luajit/src

ifeq "$(TARGET)" "win32"
OS=windows
Expand Down Expand Up @@ -43,7 +43,7 @@ ifeq ($(ARCH), x86_64)
ARCH = i686
ARCH_CFLAGS +=-m32 -msse3 -march=i686 -mtune=generic
else ifeq ($(ARCH), aarch64)
ARCH_CFLAGS +=
ARCH_CFLAGS += -march=native
#ARCH = ARCH_UNAME
XASH3D = 1
else ifeq (, $(findstring arm,$(ARCH_UNAME)))
Expand Down Expand Up @@ -81,7 +81,7 @@ CFLAGS = $(BUILD_TYPE_CFLAGS) $(BASE_CFLAGS) $(OPT_CFLAGS) $(ARCH_CFLAGS)
INCLUDE=-I. -I$(DLL_SRCDIR) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine \
-I$(HLSDK)/game_shared -I$(HLSDK)/pm_shared -I$(HLSDK)/public -I$(METAMOD) -I$(LUAMOD_API) -I$(LUA)

LDFLAGS=-L $(LUA) -lluajit -shared -lsqlite3 -lpthread -static
LDFLAGS=-L $(LUA) -lluajit -shared -lsqlite3 -lpthread

#LDFLAGS = -L./ lua - llua - lpthread - shared

Expand Down
53 changes: 27 additions & 26 deletions luajit/Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
##############################################################################
#LuaJIT top level Makefile for installation.Requires GNU Make.
# LuaJIT top level Makefile for installation. Requires GNU Make.
#
#Please read doc / install.html before changing any variables !
# Please read doc/install.html before changing any variables!
#
#Suitable for POSIX platforms(Linux, *BSD, OSX etc.).
#Note : src / Makefile has many more configurable options.
# Suitable for POSIX platforms (Linux, *BSD, OSX etc.).
# Note: src/Makefile has many more configurable options.
#
# #### #This Makefile is NOT useful for Windows !#### #
#For MSVC, please follow the instructions given in src / msvcbuild.bat.
#For MinGW and Cygwin, cd to src and run make with the Makefile there.
# ##### This Makefile is NOT useful for Windows! #####
# For MSVC, please follow the instructions given in src/msvcbuild.bat.
# For MinGW and Cygwin, cd to src and run make with the Makefile there.
#
#Copyright(C) 2005 - 2017 Mike Pall.See Copyright Notice in luajit.h
# Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
##############################################################################

MAJVER= 2
Expand All @@ -22,8 +22,8 @@ ABIVER= 5.1

##############################################################################
#
#Change the installation path as needed.This automatically adjusts
#the paths in src / luaconf.h, too.Note : PREFIX must be an absolute path !
# Change the installation path as needed. This automatically adjusts
# the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
#
export PREFIX= /usr/local
export MULTILIB= lib
Expand Down Expand Up @@ -142,24 +142,25 @@ install: $(INSTALL_DEP)
uninstall:
@echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
$(UNINSTALL) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC)
for file in $(FILES_JITLIB);
do
$(UNINSTALL) $(INSTALL_JITLIB) / $$file;
done
for file in $(FILES_INC);
do
$(UNINSTALL) $(INSTALL_INC) / $$file;
done $(LDCONFIG) $(INSTALL_LIB) $(RMDIR) $(UNINSTALL_DIRS) ||
: @echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ===="
for file in $(FILES_JITLIB); do \
$(UNINSTALL) $(INSTALL_JITLIB)/$$file; \
done
for file in $(FILES_INC); do \
$(UNINSTALL) $(INSTALL_INC)/$$file; \
done
$(LDCONFIG) $(INSTALL_LIB)
$(RMDIR) $(UNINSTALL_DIRS) || :
@echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ===="

##############################################################################
##############################################################################

amalg : @echo "Building LuaJIT $(VERSION)" $(MAKE)
- C src amalg
amalg:
@echo "Building LuaJIT $(VERSION)"
$(MAKE) -C src amalg

clean : $(MAKE)
- C src clean
clean:
$(MAKE) -C src clean

.PHONY : all install amalg clean
.PHONY: all install amalg clean

##############################################################################
##############################################################################
Loading

0 comments on commit 8630fa7

Please sign in to comment.