projects
/
NeonServV5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/development'
[NeonServV5.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e0105d6d5997131236477125d25ac3194c05d0de..679e1f6c98ed946673732e55de66d3453cf3234a 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-67,6
+67,7
@@
libNeonHelp_la_LIBADD = $(MYSQL_LIBS)
libNeonBackup_la_SOURCES = src/modules/NeonBackup.mod/bot_NeonBackup.c \
src/modules/NeonBackup.mod/cmd_neonbackup.c \
libNeonBackup_la_SOURCES = src/modules/NeonBackup.mod/bot_NeonBackup.c \
src/modules/NeonBackup.mod/cmd_neonbackup.c \
+ src/modules/NeonBackup.mod/cmd_neonbackup_recover.c \
src/modules/NeonBackup.mod/module.c
libNeonBackup_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
libNeonBackup_la_LIBADD = $(MYSQL_LIBS)
src/modules/NeonBackup.mod/module.c
libNeonBackup_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
libNeonBackup_la_LIBADD = $(MYSQL_LIBS)
@@
-168,6
+169,10
@@
libNeonFun_la_SOURCES = src/modules/NeonFun.mod/bot_NeonFun.c \
src/modules/NeonFun.mod/cmd_neonfun_4stone.c \
src/modules/NeonFun.mod/cmd_neonfun_4view.c \
src/modules/NeonFun.mod/game_4wins.c \
src/modules/NeonFun.mod/cmd_neonfun_4stone.c \
src/modules/NeonFun.mod/cmd_neonfun_4view.c \
src/modules/NeonFun.mod/game_4wins.c \
+ src/modules/NeonFun.mod/cmd_neonfun_blackjack.c \
+ src/modules/NeonFun.mod/cmd_neonfun_bjtake.c \
+ src/modules/NeonFun.mod/cmd_neonfun_bjenough.c \
+ src/modules/NeonFun.mod/game_blackjack.c \
src/modules/NeonFun.mod/module.c
libNeonFun_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
libNeonFun_la_LIBADD = $(MYSQL_LIBS)
src/modules/NeonFun.mod/module.c
libNeonFun_la_LDFLAGS = -module -rpath /nowhere -avoid-version -no-undefined
libNeonFun_la_LIBADD = $(MYSQL_LIBS)
@@
-213,7
+218,8
@@
neonserv_SOURCES = src/version.c \
src/ModuleFunctions.c \
src/statistics.c \
src/log.c \
src/ModuleFunctions.c \
src/statistics.c \
src/log.c \
- src/memoryDebug.c
+ src/memoryDebug.c \
+ src/mutexDebug.c
neonserv_LDADD = $(MYSQL_LIBS) $(SYSTEM_LIBS)
neonserv_LDADD = $(MYSQL_LIBS) $(SYSTEM_LIBS)