diff --git a/Build4Makefile.sh b/Build4Makefile.sh old mode 100644 new mode 100755 index e21fc5a86a..30a563f494 --- a/Build4Makefile.sh +++ b/Build4Makefile.sh @@ -1,5 +1,8 @@ +# delete old makefile(s) +find ../NFComm -name 'makefile' -type f -print -exec rm -rf {} \; +find ../NFServer -name 'makefile' -type f -print -exec rm -rf {} \; -# start to generate makefile +# start to generate makefile(s) cd ./Tool ./cbp2make.linux-x86_64 -in ../NFComm/NFCluster/NFMysqlClusterPlugin.cbp -out ../NFComm/NFCluster/makefile @@ -28,43 +31,44 @@ cd ./Tool ./cbp2make.linux-x86_64 -in ../NFServer/NFMasterServerPlugin/NFMasterServerPlugin.cbp -out ../NFServer/NFMasterServerPlugin/makefile ./cbp2make.linux-x86_64 -in ../NFServer/NFProxyServerNet_ClientPlugin/NFProxyServerNet_ClientPlugin.cbp -out ../NFServer/NFProxyServerNet_ClientPlugin/makefile ./cbp2make.linux-x86_64 -in ../NFServer/NFProxyServerNet_ServerPlugin/NFProxyServerNet_ServerPlugin.cbp -out ../NFServer/NFProxyServerNet_ServerPlugin/makefile -./cbp2make.linux-x86_64 -in ../NFServer/NFProxyPlugin/NFProxyPlugin.cbp -out ../NFServer/NFProxyPlugin/makefile +./cbp2make.linux-x86_64 -in ../NFServer/NFProxyServerPlugin/NFProxyPlugin.cbp -out ../NFServer/NFProxyServerPlugin/makefile ./cbp2make.linux-x86_64 -in ../NFServer/NFWorldLogicPlugin/NFWorldLogicPlugin.cbp -out ../NFServer/NFWorldLogicPlugin/makefile ./cbp2make.linux-x86_64 -in ../NFServer/NFWorldNet_ClientPlugin/NFWorldNet_ClientPlugin.cbp -out ../NFServer/NFWorldNet_ClientPlugin/makefile ./cbp2make.linux-x86_64 -in ../NFServer/NFWorldNet_ServerPlugin/NFWorldNet_ServerPlugin.cbp -out ../NFServer/NFWorldNet_ServerPlugin/makefile -# add SolutionDir + +# add SolutionDir in line 20 # SolutionDir = ../../ -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFCluster/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFConfigPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFCore/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFCrashPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFDataBasePlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFDataNoSqlPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFKernelPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFLogPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFLuaScriptPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFMessageDefine/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFNet/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFPluginLoader/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFTagPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFUrlPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFCluster/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFConfigPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFCore/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFCrashPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFDataBasePlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFDataNoSqlPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFKernelPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFLogPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFLuaScriptPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFMessageDefine/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFNet/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFPluginLoader/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFTagPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFComm/NFUrlPlugin/makefile + +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFDataBaseNet_ClientPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFGameServerNet_ClientPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFGameServerNet_ServerPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFGameServerPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFLoginLogicPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFLoginNet_ClientPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFLoginNet_ServerPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFMasterNet_ServerPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFMasterServerPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFProxyServerNet_ClientPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFProxyServerNet_ServerPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFProxyServerPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFWorldLogicPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFWorldNet_ClientPlugin/makefile +sed -i '20i\SolutionDir = ../../\n' ../NFServer/NFWorldNet_ServerPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFDataBaseNet_ClientPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFGameServerNet_ClientPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFGameServerNet_ServerPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFGameServerPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFLoginLogicPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFLoginNet_ClientPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFLoginNet_ServerPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFMasterNet_ServerPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFMasterServerPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFProxyServerNet_ClientPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFProxyServerNet_ServerPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFProxyPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFWorldLogicPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFWorldNet_ClientPlugin/makefile -sed '/LDFLAGS = /a\SolutionDir = ../../\n' ../NFComm/NFWorldNet_ServerPlugin/makefile -cd ../ \ No newline at end of file diff --git a/Dependencies/build_dep.sh b/Dependencies/build_dep.sh index 93d1d56748..39a7d75234 100755 --- a/Dependencies/build_dep.sh +++ b/Dependencies/build_dep.sh @@ -66,4 +66,5 @@ cd ../ # TODO: other libs # back to main dir -cd ../ \ No newline at end of file +pwd + diff --git a/NFComm/NFCluster/makefile b/NFComm/NFCluster/makefile index f161b92095..2c0eebab91 100644 --- a/NFComm/NFCluster/makefile +++ b/NFComm/NFCluster/makefile @@ -19,59 +19,70 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/mysql/ -I$(SolutionDir)/Dependencies/mysqlpp/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/mysql/ -I$(SolutionDir)/Dependencies/mysqlpp/ -I$(SolutionDir)/Dependencies/protobuf/src/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Debug/ -LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFCore_d.a $(SolutionDir)/Dependencies/lib/Debug/libmysqlpp.a $(SolutionDir)/Dependencies/lib/Debug/libmysqlclient.a +LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFCore_d.a $(SolutionDir)/Dependencies/lib/Debug/libmysqlpp.a $(SolutionDir)/Dependencies/lib/Debug/libmysqlclient.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/mysql/ -I$(SolutionDir)/Dependencies/mysqlpp/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/mysql/ -I$(SolutionDir)/Dependencies/mysqlpp/ -I$(SolutionDir)/Dependencies/protobuf/src/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -DNDEBUG -D_USRDLL RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ -LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFCore.a $(SolutionDir)/Dependencies/lib/Release/libmysqlpp.a $(SolutionDir)/Dependencies/lib/Release/libmysqlclient.a +LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFCore.a $(SolutionDir)/Dependencies/lib/Release/libmysqlpp.a $(SolutionDir)/Dependencies/lib/Release/libmysqlclient.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFMysqlClusterPlugin.so -OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCMysqlClusterModule.o $(OBJDIR_DEBUG_X64)/NFCMysqlConnectMgrModule.o $(OBJDIR_DEBUG_X64)/NFCMysqlDriver.o $(OBJDIR_DEBUG_X64)/NFMysqlClusterPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o +OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCAsyMysqlClusterModule.o $(OBJDIR_DEBUG_X64)/NFCMysqlClusterModule.o $(OBJDIR_DEBUG_X64)/NFCMysqlDriver.o $(OBJDIR_DEBUG_X64)/NFCMysqlDriverManager.o $(OBJDIR_DEBUG_X64)/NFMysqlClusterPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o -OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCMysqlClusterModule.o $(OBJDIR_RELEASE_X64)/NFCMysqlConnectMgrModule.o $(OBJDIR_RELEASE_X64)/NFCMysqlDriver.o $(OBJDIR_RELEASE_X64)/NFMysqlClusterPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o +OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCAsyMysqlClusterModule.o $(OBJDIR_RELEASE_X64)/NFCMysqlClusterModule.o $(OBJDIR_RELEASE_X64)/NFCMysqlDriver.o $(OBJDIR_RELEASE_X64)/NFCMysqlDriverManager.o $(OBJDIR_RELEASE_X64)/NFMysqlClusterPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: - cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFGameServer1/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFLoginServer/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFWorldServer/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFMasterServer/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFProxyServer1/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFGameServer1/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial1/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial2/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFMysqlClusterPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial5/ debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 out_debug_x64: before_debug_x64 $(OBJ_DEBUG_X64) $(DEP_DEBUG_X64) $(LD) -shared $(LIBDIR_DEBUG_X64) $(OBJ_DEBUG_X64) -o $(OUT_DEBUG_X64) $(LDFLAGS_DEBUG_X64) $(LIB_DEBUG_X64) +$(OBJDIR_DEBUG_X64)/NFCAsyMysqlClusterModule.o: NFCAsyMysqlClusterModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCAsyMysqlClusterModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCAsyMysqlClusterModule.o + $(OBJDIR_DEBUG_X64)/NFCMysqlClusterModule.o: NFCMysqlClusterModule.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCMysqlClusterModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCMysqlClusterModule.o -$(OBJDIR_DEBUG_X64)/NFCMysqlConnectMgrModule.o: NFCMysqlConnectMgrModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCMysqlConnectMgrModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCMysqlConnectMgrModule.o - $(OBJDIR_DEBUG_X64)/NFCMysqlDriver.o: NFCMysqlDriver.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCMysqlDriver.cpp -o $(OBJDIR_DEBUG_X64)/NFCMysqlDriver.o +$(OBJDIR_DEBUG_X64)/NFCMysqlDriverManager.o: NFCMysqlDriverManager.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCMysqlDriverManager.cpp -o $(OBJDIR_DEBUG_X64)/NFCMysqlDriverManager.o + $(OBJDIR_DEBUG_X64)/NFMysqlClusterPlugin.o: NFMysqlClusterPlugin.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFMysqlClusterPlugin.cpp -o $(OBJDIR_DEBUG_X64)/NFMysqlClusterPlugin.o @@ -80,32 +91,42 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: - cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/NFGameServer1/ cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/NFLoginServer/ cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/NFWorldServer/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/NFMasterServer/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/NFProxyServer1/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/NFGameServer1/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial1/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial2/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFMysqlClusterPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial5/ release_x64: before_release_x64 out_release_x64 after_release_x64 out_release_x64: before_release_x64 $(OBJ_RELEASE_X64) $(DEP_RELEASE_X64) $(LD) -shared $(LIBDIR_RELEASE_X64) $(OBJ_RELEASE_X64) -o $(OUT_RELEASE_X64) $(LDFLAGS_RELEASE_X64) $(LIB_RELEASE_X64) +$(OBJDIR_RELEASE_X64)/NFCAsyMysqlClusterModule.o: NFCAsyMysqlClusterModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCAsyMysqlClusterModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCAsyMysqlClusterModule.o + $(OBJDIR_RELEASE_X64)/NFCMysqlClusterModule.o: NFCMysqlClusterModule.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCMysqlClusterModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCMysqlClusterModule.o -$(OBJDIR_RELEASE_X64)/NFCMysqlConnectMgrModule.o: NFCMysqlConnectMgrModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCMysqlConnectMgrModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCMysqlConnectMgrModule.o - $(OBJDIR_RELEASE_X64)/NFCMysqlDriver.o: NFCMysqlDriver.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCMysqlDriver.cpp -o $(OBJDIR_RELEASE_X64)/NFCMysqlDriver.o +$(OBJDIR_RELEASE_X64)/NFCMysqlDriverManager.o: NFCMysqlDriverManager.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCMysqlDriverManager.cpp -o $(OBJDIR_RELEASE_X64)/NFCMysqlDriverManager.o + $(OBJDIR_RELEASE_X64)/NFMysqlClusterPlugin.o: NFMysqlClusterPlugin.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFMysqlClusterPlugin.cpp -o $(OBJDIR_RELEASE_X64)/NFMysqlClusterPlugin.o @@ -114,7 +135,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFConfigPlugin/makefile b/NFComm/NFConfigPlugin/makefile index 0d589b057a..bd22d6c9c9 100644 --- a/NFComm/NFConfigPlugin/makefile +++ b/NFComm/NFConfigPlugin/makefile @@ -19,7 +19,8 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/External/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/Theron/Include/External/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) @@ -28,9 +29,9 @@ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFCore_d.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFConfigPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFConfigPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/External/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/Theron/Include/External/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -DNDEBUG -D_USRDLL RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) @@ -39,7 +40,7 @@ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFCore.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFConfigPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFConfigPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCElementInfoModule.o $(OBJDIR_DEBUG_X64)/NFCLogicClassModule.o $(OBJDIR_DEBUG_X64)/NFConfigPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -61,6 +62,9 @@ after_debug_x64: cp -f $(SolutionDir)/_Out/Comm/Debug/NFConfigPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFGameServer1/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFConfigPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial1/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFConfigPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial2/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFConfigPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFConfigPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFConfigPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial5/ debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 @@ -81,11 +85,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -96,6 +100,9 @@ after_release_x64: cp -f $(SolutionDir)/_Out/Comm/Release/NFConfigPlugin.so $(SolutionDir)/_Out/Server/Release/NFGameServer1/ cp -f $(SolutionDir)/_Out/Comm/Release/NFConfigPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial1/ cp -f $(SolutionDir)/_Out/Comm/Release/NFConfigPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial2/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFConfigPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFConfigPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFConfigPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial5/ release_x64: before_release_x64 out_release_x64 after_release_x64 @@ -116,7 +123,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFCore/makefile b/NFComm/NFCore/makefile index fa1bfe3eeb..da01f381ca 100644 --- a/NFComm/NFCore/makefile +++ b/NFComm/NFCore/makefile @@ -19,7 +19,8 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/boost_1_53_0/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_X64 -D_DEBUG RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) @@ -28,9 +29,9 @@ LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFCore_d.a +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFCore_d.a -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/boost_1_53_0/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_X64 -DNDEBUG RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) @@ -39,18 +40,18 @@ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFCore.a +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFCore.a -OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCore.o $(OBJDIR_DEBUG_X64)/NFTimer.o $(OBJDIR_DEBUG_X64)/NFCComponentManager.o $(OBJDIR_DEBUG_X64)/NFCDataList.o $(OBJDIR_DEBUG_X64)/NFCHeartBeatManager.o $(OBJDIR_DEBUG_X64)/NFCMemory.o $(OBJDIR_DEBUG_X64)/NFCComponent.o $(OBJDIR_DEBUG_X64)/NFCObject.o $(OBJDIR_DEBUG_X64)/NFCProperty.o $(OBJDIR_DEBUG_X64)/NFCPropertyManager.o $(OBJDIR_DEBUG_X64)/NFCRecord.o $(OBJDIR_DEBUG_X64)/NFCRecordManager.o +OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCore.o $(OBJDIR_DEBUG_X64)/NFTimer.o $(OBJDIR_DEBUG_X64)/NFCComponentManager.o $(OBJDIR_DEBUG_X64)/NFCDataList.o $(OBJDIR_DEBUG_X64)/NFCEventManager.o $(OBJDIR_DEBUG_X64)/NFCHeartBeatManager.o $(OBJDIR_DEBUG_X64)/NFCMemManger.o $(OBJDIR_DEBUG_X64)/NFCObject.o $(OBJDIR_DEBUG_X64)/NFCProperty.o $(OBJDIR_DEBUG_X64)/NFCPropertyManager.o $(OBJDIR_DEBUG_X64)/NFCRecord.o $(OBJDIR_DEBUG_X64)/NFCRecordManager.o -OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCore.o $(OBJDIR_RELEASE_X64)/NFTimer.o $(OBJDIR_RELEASE_X64)/NFCComponentManager.o $(OBJDIR_RELEASE_X64)/NFCDataList.o $(OBJDIR_RELEASE_X64)/NFCHeartBeatManager.o $(OBJDIR_RELEASE_X64)/NFCMemory.o $(OBJDIR_RELEASE_X64)/NFCComponent.o $(OBJDIR_RELEASE_X64)/NFCObject.o $(OBJDIR_RELEASE_X64)/NFCProperty.o $(OBJDIR_RELEASE_X64)/NFCPropertyManager.o $(OBJDIR_RELEASE_X64)/NFCRecord.o $(OBJDIR_RELEASE_X64)/NFCRecordManager.o +OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCore.o $(OBJDIR_RELEASE_X64)/NFTimer.o $(OBJDIR_RELEASE_X64)/NFCComponentManager.o $(OBJDIR_RELEASE_X64)/NFCDataList.o $(OBJDIR_RELEASE_X64)/NFCEventManager.o $(OBJDIR_RELEASE_X64)/NFCHeartBeatManager.o $(OBJDIR_RELEASE_X64)/NFCMemManger.o $(OBJDIR_RELEASE_X64)/NFCObject.o $(OBJDIR_RELEASE_X64)/NFCProperty.o $(OBJDIR_RELEASE_X64)/NFCPropertyManager.o $(OBJDIR_RELEASE_X64)/NFCRecord.o $(OBJDIR_RELEASE_X64)/NFCRecordManager.o all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,14 @@ $(OBJDIR_DEBUG_X64)/NFCComponentManager.o: NFCComponentManager.cpp $(OBJDIR_DEBUG_X64)/NFCDataList.o: NFCDataList.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCDataList.cpp -o $(OBJDIR_DEBUG_X64)/NFCDataList.o +$(OBJDIR_DEBUG_X64)/NFCEventManager.o: NFCEventManager.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCEventManager.cpp -o $(OBJDIR_DEBUG_X64)/NFCEventManager.o + $(OBJDIR_DEBUG_X64)/NFCHeartBeatManager.o: NFCHeartBeatManager.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCHeartBeatManager.cpp -o $(OBJDIR_DEBUG_X64)/NFCHeartBeatManager.o -$(OBJDIR_DEBUG_X64)/NFCMemory.o: NFCMemory.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCMemory.cpp -o $(OBJDIR_DEBUG_X64)/NFCMemory.o +$(OBJDIR_DEBUG_X64)/NFCMemManger.o: NFCMemManger.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCMemManger.cpp -o $(OBJDIR_DEBUG_X64)/NFCMemManger.o $(OBJDIR_DEBUG_X64)/NFCObject.o: NFCObject.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCObject.cpp -o $(OBJDIR_DEBUG_X64)/NFCObject.o @@ -95,11 +99,11 @@ $(OBJDIR_DEBUG_X64)/NFCRecordManager.o: NFCRecordManager.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -121,11 +125,14 @@ $(OBJDIR_RELEASE_X64)/NFCComponentManager.o: NFCComponentManager.cpp $(OBJDIR_RELEASE_X64)/NFCDataList.o: NFCDataList.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCDataList.cpp -o $(OBJDIR_RELEASE_X64)/NFCDataList.o +$(OBJDIR_RELEASE_X64)/NFCEventManager.o: NFCEventManager.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCEventManager.cpp -o $(OBJDIR_RELEASE_X64)/NFCEventManager.o + $(OBJDIR_RELEASE_X64)/NFCHeartBeatManager.o: NFCHeartBeatManager.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCHeartBeatManager.cpp -o $(OBJDIR_RELEASE_X64)/NFCHeartBeatManager.o -$(OBJDIR_RELEASE_X64)/NFCMemory.o: NFCMemory.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCMemory.cpp -o $(OBJDIR_RELEASE_X64)/NFCMemory.o +$(OBJDIR_RELEASE_X64)/NFCMemManger.o: NFCMemManger.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCMemManger.cpp -o $(OBJDIR_RELEASE_X64)/NFCMemManger.o $(OBJDIR_RELEASE_X64)/NFCObject.o: NFCObject.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCObject.cpp -o $(OBJDIR_RELEASE_X64)/NFCObject.o @@ -144,7 +151,7 @@ $(OBJDIR_RELEASE_X64)/NFCRecordManager.o: NFCRecordManager.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFCrashPlugin/makefile b/NFComm/NFCrashPlugin/makefile index b1d0280e5f..5325bd4401 100644 --- a/NFComm/NFCrashPlugin/makefile +++ b/NFComm/NFCrashPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/google-breakpad/src -I$(SolutionDir)/Dependencies + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/google-breakpad/src -I$(SolutionDir)/Dependencies CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -fpic -D_X64 -D_DEBUG RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Deubg/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Deubg/ LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFCrashPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFCrashPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/google-breakpad/src -I$(SolutionDir)/Dependencies +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/google-breakpad/src -I$(SolutionDir)/Dependencies CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fpic -D_X64 -DNDEBUG -D_USRDLL RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFCrashPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFCrashPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCCrashModule.o $(OBJDIR_DEBUG_X64)/NFCrashPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -61,6 +62,9 @@ after_debug_x64: cp -f $(SolutionDir)/_Out/Comm/Debug/NFCrashPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFGameServer1/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFCrashPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial1/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFCrashPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial2/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFCrashPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFCrashPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFCrashPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial5/ debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 @@ -78,11 +82,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -93,6 +97,9 @@ after_release_x64: cp -f $(SolutionDir)/_Out/Comm/Release/NFCrashPlugin.so $(SolutionDir)/_Out/Server/Release/NFGameServer1/ cp -f $(SolutionDir)/_Out/Comm/Release/NFCrashPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial1/ cp -f $(SolutionDir)/_Out/Comm/Release/NFCrashPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial2/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFCrashPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFCrashPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFCrashPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial5/ release_x64: before_release_x64 out_release_x64 after_release_x64 @@ -110,7 +117,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFDataBasePlugin/makefile b/NFComm/NFDataBasePlugin/makefile index 69e9d60457..df50dbc283 100644 --- a/NFComm/NFDataBasePlugin/makefile +++ b/NFComm/NFDataBasePlugin/makefile @@ -19,7 +19,8 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/External/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/Theron/Include/External/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) @@ -28,9 +29,9 @@ LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFDataBasePlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFDataBasePlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/External/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/Theron/Include/External/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -DNDEBUG -D_USRDLL RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) @@ -39,7 +40,7 @@ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFDataBasePlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFDataBasePlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCDataBaseDriver.o $(OBJDIR_DEBUG_X64)/NFCDataBaseModule.o $(OBJDIR_DEBUG_X64)/NFDataBasePlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -81,11 +82,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -116,7 +117,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFDataNoSqlPlugin/makefile b/NFComm/NFDataNoSqlPlugin/makefile index 34dd64dc38..4ff9182d95 100644 --- a/NFComm/NFDataNoSqlPlugin/makefile +++ b/NFComm/NFDataNoSqlPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/google-breakpad/src + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/google-breakpad/src CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -D_DEBUG -fpic -D_USRDLL -DTHERON_CPP11 RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Deubg/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Deubg/ LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFDataNoSqlPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFDataNoSqlPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/google-breakpad/src +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/google-breakpad/src CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -DNDEBUG -fpic -D_USRDLL -DTHERON_CPP11 RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFDataNoSqlPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFDataNoSqlPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCDataNoSqlDriver.o $(OBJDIR_DEBUG_X64)/NFCDataNoSqlModule.o $(OBJDIR_DEBUG_X64)/NFCPlatformDataModule.o $(OBJDIR_DEBUG_X64)/NFDataNoSqlPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -84,11 +85,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -122,7 +123,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFKernelPlugin/makefile b/NFComm/NFKernelPlugin/makefile index c506c67cdb..c3cc115cac 100644 --- a/NFComm/NFKernelPlugin/makefile +++ b/NFComm/NFKernelPlugin/makefile @@ -19,42 +19,42 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFCore_d.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFKernelPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFKernelPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -DNDEBUG -D_USRDLL RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFCore.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFKernelPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFKernelPlugin.so -OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFContainerModule/NFCContainerModule.o $(OBJDIR_DEBUG_X64)/NFGridModule/NFCGridModule.o $(OBJDIR_DEBUG_X64)/NFKernelModule/NFCConcurrentModule.o $(OBJDIR_DEBUG_X64)/NFKernelModule/NFCKernelModule.o $(OBJDIR_DEBUG_X64)/NFKernelModule/NFCUUIDModule.o $(OBJDIR_DEBUG_X64)/NFKernelPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o +OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFKernelModule/NFCKernelModule.o $(OBJDIR_DEBUG_X64)/NFKernelModule/NFCUUIDModule.o $(OBJDIR_DEBUG_X64)/NFKernelPlugin.o $(OBJDIR_DEBUG_X64)/NFSceneModule/NFCSceneModule.o $(OBJDIR_DEBUG_X64)/dllmain.o -OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFContainerModule/NFCContainerModule.o $(OBJDIR_RELEASE_X64)/NFGridModule/NFCGridModule.o $(OBJDIR_RELEASE_X64)/NFKernelModule/NFCConcurrentModule.o $(OBJDIR_RELEASE_X64)/NFKernelModule/NFCKernelModule.o $(OBJDIR_RELEASE_X64)/NFKernelModule/NFCUUIDModule.o $(OBJDIR_RELEASE_X64)/NFKernelPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o +OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFKernelModule/NFCKernelModule.o $(OBJDIR_RELEASE_X64)/NFKernelModule/NFCUUIDModule.o $(OBJDIR_RELEASE_X64)/NFKernelPlugin.o $(OBJDIR_RELEASE_X64)/NFSceneModule/NFCSceneModule.o $(OBJDIR_RELEASE_X64)/dllmain.o all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug - test -d $(OBJDIR_DEBUG_X64)/NFContainerModule || mkdir -p $(OBJDIR_DEBUG_X64)/NFContainerModule - test -d $(OBJDIR_DEBUG_X64)/NFGridModule || mkdir -p $(OBJDIR_DEBUG_X64)/NFGridModule + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64)/NFKernelModule || mkdir -p $(OBJDIR_DEBUG_X64)/NFKernelModule test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) + test -d $(OBJDIR_DEBUG_X64)/NFSceneModule || mkdir -p $(OBJDIR_DEBUG_X64)/NFSceneModule after_debug_x64: cp -f $(SolutionDir)/_Out/Comm/Debug/NFKernelPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFLoginServer/ @@ -65,21 +65,14 @@ after_debug_x64: cp -f $(SolutionDir)/_Out/Comm/Debug/NFKernelPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial1/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFKernelPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial2/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFKernelPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFKernelPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFKernelPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial5/ debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 out_debug_x64: before_debug_x64 $(OBJ_DEBUG_X64) $(DEP_DEBUG_X64) $(LD) -shared $(LIBDIR_DEBUG_X64) $(OBJ_DEBUG_X64) -o $(OUT_DEBUG_X64) $(LDFLAGS_DEBUG_X64) $(LIB_DEBUG_X64) -$(OBJDIR_DEBUG_X64)/NFContainerModule/NFCContainerModule.o: NFContainerModule/NFCContainerModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFContainerModule/NFCContainerModule.cpp -o $(OBJDIR_DEBUG_X64)/NFContainerModule/NFCContainerModule.o - -$(OBJDIR_DEBUG_X64)/NFGridModule/NFCGridModule.o: NFGridModule/NFCGridModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFGridModule/NFCGridModule.cpp -o $(OBJDIR_DEBUG_X64)/NFGridModule/NFCGridModule.o - -$(OBJDIR_DEBUG_X64)/NFKernelModule/NFCConcurrentModule.o: NFKernelModule/NFCConcurrentModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFKernelModule/NFCConcurrentModule.cpp -o $(OBJDIR_DEBUG_X64)/NFKernelModule/NFCConcurrentModule.o - $(OBJDIR_DEBUG_X64)/NFKernelModule/NFCKernelModule.o: NFKernelModule/NFCKernelModule.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFKernelModule/NFCKernelModule.cpp -o $(OBJDIR_DEBUG_X64)/NFKernelModule/NFCKernelModule.o @@ -89,23 +82,24 @@ $(OBJDIR_DEBUG_X64)/NFKernelModule/NFCUUIDModule.o: NFKernelModule/NFCUUIDModule $(OBJDIR_DEBUG_X64)/NFKernelPlugin.o: NFKernelPlugin.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFKernelPlugin.cpp -o $(OBJDIR_DEBUG_X64)/NFKernelPlugin.o +$(OBJDIR_DEBUG_X64)/NFSceneModule/NFCSceneModule.o: NFSceneModule/NFCSceneModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFSceneModule/NFCSceneModule.cpp -o $(OBJDIR_DEBUG_X64)/NFSceneModule/NFCSceneModule.o + $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c dllmain.cpp -o $(OBJDIR_DEBUG_X64)/dllmain.o clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug - rm -rf $(OBJDIR_DEBUG_X64)/NFContainerModule - rm -rf $(OBJDIR_DEBUG_X64)/NFGridModule + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64)/NFKernelModule rm -rf $(OBJDIR_DEBUG_X64) + rm -rf $(OBJDIR_DEBUG_X64)/NFSceneModule before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release - test -d $(OBJDIR_RELEASE_X64)/NFContainerModule || mkdir -p $(OBJDIR_RELEASE_X64)/NFContainerModule - test -d $(OBJDIR_RELEASE_X64)/NFGridModule || mkdir -p $(OBJDIR_RELEASE_X64)/NFGridModule + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64)/NFKernelModule || mkdir -p $(OBJDIR_RELEASE_X64)/NFKernelModule test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) + test -d $(OBJDIR_RELEASE_X64)/NFSceneModule || mkdir -p $(OBJDIR_RELEASE_X64)/NFSceneModule after_release_x64: cp -f $(SolutionDir)/_Out/Comm/Release/NFKernelPlugin.so $(SolutionDir)/_Out/Server/Release/NFLoginServer/ @@ -116,21 +110,14 @@ after_release_x64: cp -f $(SolutionDir)/_Out/Comm/Release/NFKernelPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial1/ cp -f $(SolutionDir)/_Out/Comm/Release/NFKernelPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial2/ cp -f $(SolutionDir)/_Out/Comm/Release/NFKernelPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFKernelPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFKernelPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial5/ release_x64: before_release_x64 out_release_x64 after_release_x64 out_release_x64: before_release_x64 $(OBJ_RELEASE_X64) $(DEP_RELEASE_X64) $(LD) -shared $(LIBDIR_RELEASE_X64) $(OBJ_RELEASE_X64) -o $(OUT_RELEASE_X64) $(LDFLAGS_RELEASE_X64) $(LIB_RELEASE_X64) -$(OBJDIR_RELEASE_X64)/NFContainerModule/NFCContainerModule.o: NFContainerModule/NFCContainerModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFContainerModule/NFCContainerModule.cpp -o $(OBJDIR_RELEASE_X64)/NFContainerModule/NFCContainerModule.o - -$(OBJDIR_RELEASE_X64)/NFGridModule/NFCGridModule.o: NFGridModule/NFCGridModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFGridModule/NFCGridModule.cpp -o $(OBJDIR_RELEASE_X64)/NFGridModule/NFCGridModule.o - -$(OBJDIR_RELEASE_X64)/NFKernelModule/NFCConcurrentModule.o: NFKernelModule/NFCConcurrentModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFKernelModule/NFCConcurrentModule.cpp -o $(OBJDIR_RELEASE_X64)/NFKernelModule/NFCConcurrentModule.o - $(OBJDIR_RELEASE_X64)/NFKernelModule/NFCKernelModule.o: NFKernelModule/NFCKernelModule.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFKernelModule/NFCKernelModule.cpp -o $(OBJDIR_RELEASE_X64)/NFKernelModule/NFCKernelModule.o @@ -140,16 +127,18 @@ $(OBJDIR_RELEASE_X64)/NFKernelModule/NFCUUIDModule.o: NFKernelModule/NFCUUIDModu $(OBJDIR_RELEASE_X64)/NFKernelPlugin.o: NFKernelPlugin.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFKernelPlugin.cpp -o $(OBJDIR_RELEASE_X64)/NFKernelPlugin.o +$(OBJDIR_RELEASE_X64)/NFSceneModule/NFCSceneModule.o: NFSceneModule/NFCSceneModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFSceneModule/NFCSceneModule.cpp -o $(OBJDIR_RELEASE_X64)/NFSceneModule/NFCSceneModule.o + $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c dllmain.cpp -o $(OBJDIR_RELEASE_X64)/dllmain.o clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release - rm -rf $(OBJDIR_RELEASE_X64)/NFContainerModule - rm -rf $(OBJDIR_RELEASE_X64)/NFGridModule + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64)/NFKernelModule rm -rf $(OBJDIR_RELEASE_X64) + rm -rf $(OBJDIR_RELEASE_X64)/NFSceneModule .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFLogPlugin/makefile b/NFComm/NFLogPlugin/makefile index 096b0a5123..25eff43dd5 100644 --- a/NFComm/NFLogPlugin/makefile +++ b/NFComm/NFLogPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ -LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/libboost_filesystem-mt-s.a $(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/libboost_system-mt-s.a +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Debug/ +LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFLogPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFLogPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -DNDEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFLogPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFLogPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCLogModule.o $(OBJDIR_DEBUG_X64)/NFLogPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -62,6 +63,8 @@ after_debug_x64: cp -f $(SolutionDir)/_Out/Comm/Debug/NFLogPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial1/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFLogPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial2/ cp -f $(SolutionDir)/_Out/Comm/Debug/NFLogPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLogPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLogPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial5/ debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 @@ -79,11 +82,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -95,6 +98,8 @@ after_release_x64: cp -f $(SolutionDir)/_Out/Comm/Release/NFLogPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial1/ cp -f $(SolutionDir)/_Out/Comm/Release/NFLogPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial2/ cp -f $(SolutionDir)/_Out/Comm/Release/NFLogPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLogPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLogPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial5/ release_x64: before_release_x64 out_release_x64 after_release_x64 @@ -112,7 +117,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFLuaScriptPlugin/makefile b/NFComm/NFLuaScriptPlugin/makefile index 0b7aeb6220..a8c5fdee76 100644 --- a/NFComm/NFLuaScriptPlugin/makefile +++ b/NFComm/NFLuaScriptPlugin/makefile @@ -19,80 +19,115 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(NF_HOME) -I$(BOOST_HOME) -I$(NF_DEP) -I$(NF_LIBEVENT) -I$(NF_DEP)/libevent-2.0.21-stable/include -I$(NF_DEP)/libevent-2.0.21-stable/WIN32-Code -I$(NF_DEP)/libevent-2.0.21-stable/compat -I$(NF_DEP)/protobuf-2.5.0/src -I$(THERON_HOME) -CFLAGS_DEBUG_X64 = $(CFLAGS) -DWIN -D_DEBUG -D_WINDOWS -D_USRDLL -DTHERON_CPP11 + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/lua +CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(NFBIN_COMM)/$(Configuration) -L$(APP_DEPLIB)/$(Configuration) +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/lib/Debug/ LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = /NFLuaScriptPlugin.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(NF_HOME) -I$(BOOST_HOME) -I$(NF_DEP) -I$(NF_LIBEVENT) -I$(NF_DEP)/libevent-2.0.21-stable/include -I$(NF_DEP)/libevent-2.0.21-stable/WIN32-Code -I$(NF_DEP)/libevent-2.0.21-stable/compat -I$(NF_DEP)/protobuf-2.5.0/src -I$(THERON_HOME) -CFLAGS_RELEASE_X64 = $(CFLAGS) -DWIN -D_WINDOWS -D_USRDLL -DTHERON_CPP11 +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/lua +CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -DNDEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(NFBIN_COMM)/$(Configuration) -L$(APP_DEPLIB)/$(Configuration) +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/lib/Release/ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = /NFLuaScriptPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFLuaScriptPlugin.so -OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCLuaScriptModule.o $(OBJDIR_DEBUG_X64)/NFLuaScriptPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o +OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/luawrapper/luaWrapper.o $(OBJDIR_DEBUG_X64)/NFCLuaScriptModule.o $(OBJDIR_DEBUG_X64)/dllmain.o $(OBJDIR_DEBUG_X64)/NFLuaScriptPlugin.o -OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCLuaScriptModule.o $(OBJDIR_RELEASE_X64)/NFLuaScriptPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o +OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/luawrapper/luaWrapper.o $(OBJDIR_RELEASE_X64)/NFCLuaScriptModule.o $(OBJDIR_RELEASE_X64)/dllmain.o $(OBJDIR_RELEASE_X64)/NFLuaScriptPlugin.o all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug + test -d $(OBJDIR_DEBUG_X64)/luawrapper || mkdir -p $(OBJDIR_DEBUG_X64)/luawrapper test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFLoginServer/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFWorldServer/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFMasterServer/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFProxyServer1/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFGameServer1/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial1/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial2/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Debug/NFLuaScriptPlugin_d.so $(SolutionDir)/_Out/Server/Debug/Tutorial5/ debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 out_debug_x64: before_debug_x64 $(OBJ_DEBUG_X64) $(DEP_DEBUG_X64) $(LD) -shared $(LIBDIR_DEBUG_X64) $(OBJ_DEBUG_X64) -o $(OUT_DEBUG_X64) $(LDFLAGS_DEBUG_X64) $(LIB_DEBUG_X64) +$(OBJDIR_DEBUG_X64)/luawrapper/luaWrapper.o: luawrapper/luaWrapper.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c luawrapper/luaWrapper.cpp -o $(OBJDIR_DEBUG_X64)/luawrapper/luaWrapper.o + $(OBJDIR_DEBUG_X64)/NFCLuaScriptModule.o: NFCLuaScriptModule.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCLuaScriptModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCLuaScriptModule.o -$(OBJDIR_DEBUG_X64)/NFLuaScriptPlugin.o: NFLuaScriptPlugin.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFLuaScriptPlugin.cpp -o $(OBJDIR_DEBUG_X64)/NFLuaScriptPlugin.o - $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c dllmain.cpp -o $(OBJDIR_DEBUG_X64)/dllmain.o +$(OBJDIR_DEBUG_X64)/NFLuaScriptPlugin.o: NFLuaScriptPlugin.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFLuaScriptPlugin.cpp -o $(OBJDIR_DEBUG_X64)/NFLuaScriptPlugin.o + clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug + rm -rf $(OBJDIR_DEBUG_X64)/luawrapper rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release + test -d $(OBJDIR_RELEASE_X64)/luawrapper || mkdir -p $(OBJDIR_RELEASE_X64)/luawrapper test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/NFLoginServer/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/NFWorldServer/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/NFMasterServer/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/NFProxyServer1/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/NFGameServer1/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial1/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial2/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFLuaScriptPlugin.so $(SolutionDir)/_Out/Server/Release/Tutorial5/ release_x64: before_release_x64 out_release_x64 after_release_x64 out_release_x64: before_release_x64 $(OBJ_RELEASE_X64) $(DEP_RELEASE_X64) $(LD) -shared $(LIBDIR_RELEASE_X64) $(OBJ_RELEASE_X64) -o $(OUT_RELEASE_X64) $(LDFLAGS_RELEASE_X64) $(LIB_RELEASE_X64) +$(OBJDIR_RELEASE_X64)/luawrapper/luaWrapper.o: luawrapper/luaWrapper.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c luawrapper/luaWrapper.cpp -o $(OBJDIR_RELEASE_X64)/luawrapper/luaWrapper.o + $(OBJDIR_RELEASE_X64)/NFCLuaScriptModule.o: NFCLuaScriptModule.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCLuaScriptModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCLuaScriptModule.o -$(OBJDIR_RELEASE_X64)/NFLuaScriptPlugin.o: NFLuaScriptPlugin.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFLuaScriptPlugin.cpp -o $(OBJDIR_RELEASE_X64)/NFLuaScriptPlugin.o - $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c dllmain.cpp -o $(OBJDIR_RELEASE_X64)/dllmain.o +$(OBJDIR_RELEASE_X64)/NFLuaScriptPlugin.o: NFLuaScriptPlugin.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFLuaScriptPlugin.cpp -o $(OBJDIR_RELEASE_X64)/NFLuaScriptPlugin.o + clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) + rm -rf \$\(SolutionDir\)/_Out/Comm/Release + rm -rf $(OBJDIR_RELEASE_X64)/luawrapper rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFMessageDefine/makefile b/NFComm/NFMessageDefine/makefile index c1f35bd297..d7f994069e 100644 --- a/NFComm/NFMessageDefine/makefile +++ b/NFComm/NFMessageDefine/makefile @@ -19,7 +19,8 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0 -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/protobuf/src CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) @@ -28,9 +29,9 @@ LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFMessageDefine_d.a -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0 -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/protobuf/src CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -DNDEBUG RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) @@ -39,7 +40,7 @@ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFMessageDefine.a OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFSLGDefine.pb.o $(OBJDIR_DEBUG_X64)/NFMsgShare.pb.o $(OBJDIR_DEBUG_X64)/NFMsgPreGame.pb.o $(OBJDIR_DEBUG_X64)/NFMsgDefine.o $(OBJDIR_DEBUG_X64)/NFDefine.pb.o $(OBJDIR_DEBUG_X64)/NFMsgBaseEx.pb.o $(OBJDIR_DEBUG_X64)/NFMsgBase.pb.o $(OBJDIR_DEBUG_X64)/NFFleetingDefine.pb.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -86,11 +87,11 @@ $(OBJDIR_DEBUG_X64)/NFFleetingDefine.pb.o: NFFleetingDefine.pb.cc clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -126,7 +127,7 @@ $(OBJDIR_RELEASE_X64)/NFFleetingDefine.pb.o: NFFleetingDefine.pb.cc clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFNet/makefile b/NFComm/NFNet/makefile index 7965ff7491..30f69fd7d2 100644 --- a/NFComm/NFNet/makefile +++ b/NFComm/NFNet/makefile @@ -19,7 +19,8 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) @@ -28,9 +29,9 @@ LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFNet_d.a -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -DNDEBUG RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) @@ -39,18 +40,18 @@ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFNet.a +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFNet.a -OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCNet.o $(OBJDIR_DEBUG_X64)/NFCPacket.o +OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCNet.o -OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCNet.o $(OBJDIR_RELEASE_X64)/NFCPacket.o +OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCNet.o all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -63,16 +64,13 @@ out_debug_x64: before_debug_x64 $(OBJ_DEBUG_X64) $(DEP_DEBUG_X64) $(OBJDIR_DEBUG_X64)/NFCNet.o: NFCNet.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCNet.cpp -o $(OBJDIR_DEBUG_X64)/NFCNet.o -$(OBJDIR_DEBUG_X64)/NFCPacket.o: NFCPacket.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCPacket.cpp -o $(OBJDIR_DEBUG_X64)/NFCPacket.o - clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -85,12 +83,9 @@ out_release_x64: before_release_x64 $(OBJ_RELEASE_X64) $(DEP_RELEASE_X64) $(OBJDIR_RELEASE_X64)/NFCNet.o: NFCNet.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCNet.cpp -o $(OBJDIR_RELEASE_X64)/NFCNet.o -$(OBJDIR_RELEASE_X64)/NFCPacket.o: NFCPacket.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCPacket.cpp -o $(OBJDIR_RELEASE_X64)/NFCPacket.o - clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFPluginLoader/makefile b/NFComm/NFPluginLoader/makefile index 6923411349..694685ce36 100644 --- a/NFComm/NFPluginLoader/makefile +++ b/NFComm/NFPluginLoader/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ + INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/Theron/Include/External/ -CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -D_X64 -D_DEBUG -D_CONSOLE -DNF_DYNAMIC_PLUGIN -DGOOGLE_GLOG_DLL_DECL= +CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -D_X64 -D_DEBUG -D_CONSOLE -DNF_DYNAMIC_PLUGIN RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -LIB_DEBUG_X64 = $(LIB) $(SolutionDir)/Dependencies/lib/Debug/libtherond.a +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ +LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/Dependencies/lib/Debug/libtherond.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) -ldl -lpthread -OBJDIR_DEBUG_X64 = .objs_d +OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFPluginLoader_d +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFPluginLoader_d INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/Theron/Include/External/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -D_X64 -DNDEBUG -D_CONSOLE -DNF_DYNAMIC_PLUGIN RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -LIB_RELEASE_X64 = $(LIB)$ $(SolutionDir)/Dependencies/lib/Release/libtheron.a +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ +LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/Dependencies/lib/Release/libtheron.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) -ldl -lpthread -OBJDIR_RELEASE_X64 = .objs_r +OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFPluginLoader +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFPluginLoader_r OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCActor.o $(OBJDIR_DEBUG_X64)/NFCActorManager.o $(OBJDIR_DEBUG_X64)/NFCDynLib.o $(OBJDIR_DEBUG_X64)/NFCPluginManager.o $(OBJDIR_DEBUG_X64)/NFPluginLoader.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -87,24 +88,24 @@ $(OBJDIR_DEBUG_X64)/NFPluginLoader.o: NFPluginLoader.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/NFLoginServer/ - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/NFWorldServer/ - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/NFMasterServer/ - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/NFProxyServer1/ - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/NFGameServer1/ - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/Tutorial1/ - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/Tutorial2/ - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/Tutorial3/ - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/Tutorial4/ - cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader $(SolutionDir)/_Out/Server/Release/Tutorial5/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/NFLoginServer/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/NFWorldServer/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/NFMasterServer/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/NFProxyServer1/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/NFGameServer1/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/Tutorial1/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/Tutorial2/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/Tutorial3/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/Tutorial4/ + cp -f $(SolutionDir)/_Out/Comm/Release/NFPluginLoader_r $(SolutionDir)/_Out/Server/Release/Tutorial5/ release_x64: before_release_x64 out_release_x64 after_release_x64 @@ -128,7 +129,7 @@ $(OBJDIR_RELEASE_X64)/NFPluginLoader.o: NFPluginLoader.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFTagPlugin/makefile b/NFComm/NFTagPlugin/makefile index 177ad81ac1..1739890d23 100644 --- a/NFComm/NFTagPlugin/makefile +++ b/NFComm/NFTagPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFTagPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFTagPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFTagPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFTagPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCTagModule.o $(OBJDIR_DEBUG_X64)/NFTagPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -79,11 +80,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -112,7 +113,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFComm/NFUrlPlugin/makefile b/NFComm/NFUrlPlugin/makefile index c7e01dfa17..f387bc3d9b 100644 --- a/NFComm/NFUrlPlugin/makefile +++ b/NFComm/NFUrlPlugin/makefile @@ -19,38 +19,39 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB) LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFUrlPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFUrlPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB) LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFUrlPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFUrlPlugin.so -OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCUrlClientModule.o $(OBJDIR_DEBUG_X64)/NFUrlPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o +OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFUrlModule.o $(OBJDIR_DEBUG_X64)/NFUrlPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o -OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCUrlClientModule.o $(OBJDIR_RELEASE_X64)/NFUrlPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o +OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFUrlModule.o $(OBJDIR_RELEASE_X64)/NFUrlPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -68,8 +69,8 @@ debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 out_debug_x64: before_debug_x64 $(OBJ_DEBUG_X64) $(DEP_DEBUG_X64) $(LD) -shared $(LIBDIR_DEBUG_X64) $(OBJ_DEBUG_X64) -o $(OUT_DEBUG_X64) $(LDFLAGS_DEBUG_X64) $(LIB_DEBUG_X64) -$(OBJDIR_DEBUG_X64)/NFCUrlClientModule.o: NFCUrlClientModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCUrlClientModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCUrlClientModule.o +$(OBJDIR_DEBUG_X64)/NFUrlModule.o: NFUrlModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFUrlModule.cpp -o $(OBJDIR_DEBUG_X64)/NFUrlModule.o $(OBJDIR_DEBUG_X64)/NFUrlPlugin.o: NFUrlPlugin.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFUrlPlugin.cpp -o $(OBJDIR_DEBUG_X64)/NFUrlPlugin.o @@ -79,11 +80,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -101,8 +102,8 @@ release_x64: before_release_x64 out_release_x64 after_release_x64 out_release_x64: before_release_x64 $(OBJ_RELEASE_X64) $(DEP_RELEASE_X64) $(LD) -shared $(LIBDIR_RELEASE_X64) $(OBJ_RELEASE_X64) -o $(OUT_RELEASE_X64) $(LDFLAGS_RELEASE_X64) $(LIB_RELEASE_X64) -$(OBJDIR_RELEASE_X64)/NFCUrlClientModule.o: NFCUrlClientModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCUrlClientModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCUrlClientModule.o +$(OBJDIR_RELEASE_X64)/NFUrlModule.o: NFUrlModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFUrlModule.cpp -o $(OBJDIR_RELEASE_X64)/NFUrlModule.o $(OBJDIR_RELEASE_X64)/NFUrlPlugin.o: NFUrlPlugin.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFUrlPlugin.cpp -o $(OBJDIR_RELEASE_X64)/NFUrlPlugin.o @@ -112,7 +113,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFDataBaseNet_ClientPlugin/makefile b/NFServer/NFDataBaseNet_ClientPlugin/makefile index 2dc84cf801..31257a20f3 100644 --- a/NFServer/NFDataBaseNet_ClientPlugin/makefile +++ b/NFServer/NFDataBaseNet_ClientPlugin/makefile @@ -19,38 +19,39 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/mysql/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/mysql/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DNFDBNET_CLIENTPLUGIN_EXPORTS -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ -LIB_DEBUG_X64 = $(LIB)../../_Out/Comm/Debug/NFCore_d.a ../../_Out/Comm/Debug/NFMessageDefine_d.a ../../Dependencies/lib/Debug/libprotobuf.a +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ +LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFCore_d.a $(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFDataBaseNet_ClientPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFDataBaseNet_ClientPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -I$(SolutionDir)/Dependencies/mysql/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/mysql/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -DNDEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc48/ -LIB_RELEASE_X64 = $(LIB) +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ +LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFCore.a $(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFDataBaseNet_ClientPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFDataBaseNet_ClientPlugin.so -OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCDataBaseNet_ClientModule.o $(OBJDIR_DEBUG_X64)/NFCObjectSaveModule.o $(OBJDIR_DEBUG_X64)/NFDataBaseNet_ClientPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o +OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCDataProcessModule.o $(OBJDIR_DEBUG_X64)/NFDataBaseNet_ClientPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o -OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCDataBaseNet_ClientModule.o $(OBJDIR_RELEASE_X64)/NFCObjectSaveModule.o $(OBJDIR_RELEASE_X64)/NFDataBaseNet_ClientPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o +OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCDataProcessModule.o $(OBJDIR_RELEASE_X64)/NFDataBaseNet_ClientPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -70,11 +71,8 @@ debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 out_debug_x64: before_debug_x64 $(OBJ_DEBUG_X64) $(DEP_DEBUG_X64) $(LD) -shared $(LIBDIR_DEBUG_X64) $(OBJ_DEBUG_X64) -o $(OUT_DEBUG_X64) $(LDFLAGS_DEBUG_X64) $(LIB_DEBUG_X64) -$(OBJDIR_DEBUG_X64)/NFCDataBaseNet_ClientModule.o: NFCDataBaseNet_ClientModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCDataBaseNet_ClientModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCDataBaseNet_ClientModule.o - -$(OBJDIR_DEBUG_X64)/NFCObjectSaveModule.o: NFCObjectSaveModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCObjectSaveModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCObjectSaveModule.o +$(OBJDIR_DEBUG_X64)/NFCDataProcessModule.o: NFCDataProcessModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCDataProcessModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCDataProcessModule.o $(OBJDIR_DEBUG_X64)/NFDataBaseNet_ClientPlugin.o: NFDataBaseNet_ClientPlugin.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFDataBaseNet_ClientPlugin.cpp -o $(OBJDIR_DEBUG_X64)/NFDataBaseNet_ClientPlugin.o @@ -84,11 +82,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -108,11 +106,8 @@ release_x64: before_release_x64 out_release_x64 after_release_x64 out_release_x64: before_release_x64 $(OBJ_RELEASE_X64) $(DEP_RELEASE_X64) $(LD) -shared $(LIBDIR_RELEASE_X64) $(OBJ_RELEASE_X64) -o $(OUT_RELEASE_X64) $(LDFLAGS_RELEASE_X64) $(LIB_RELEASE_X64) -$(OBJDIR_RELEASE_X64)/NFCDataBaseNet_ClientModule.o: NFCDataBaseNet_ClientModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCDataBaseNet_ClientModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCDataBaseNet_ClientModule.o - -$(OBJDIR_RELEASE_X64)/NFCObjectSaveModule.o: NFCObjectSaveModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCObjectSaveModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCObjectSaveModule.o +$(OBJDIR_RELEASE_X64)/NFCDataProcessModule.o: NFCDataProcessModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCDataProcessModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCDataProcessModule.o $(OBJDIR_RELEASE_X64)/NFDataBaseNet_ClientPlugin.o: NFDataBaseNet_ClientPlugin.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFDataBaseNet_ClientPlugin.cpp -o $(OBJDIR_RELEASE_X64)/NFDataBaseNet_ClientPlugin.o @@ -122,7 +117,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFGameServerNet_ClientPlugin/makefile b/NFServer/NFGameServerNet_ClientPlugin/makefile index 46778f0551..2cd90b7ccd 100644 --- a/NFServer/NFGameServerNet_ClientPlugin/makefile +++ b/NFServer/NFGameServerNet_ClientPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFGameServerNet_ClientPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFGameServerNet_ClientPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -D_USRDLL -fPIC -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFGameServerNet_ClientPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFGameServerNet_ClientPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCGameServerToWorldModule.o $(OBJDIR_DEBUG_X64)/NFGameServerNet_ClientPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFGameServerNet_ServerPlugin/makefile b/NFServer/NFGameServerNet_ServerPlugin/makefile index 9dd9d1b528..e7c3ecd6f6 100644 --- a/NFServer/NFGameServerNet_ServerPlugin/makefile +++ b/NFServer/NFGameServerNet_ServerPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFGameServerNet_ServerPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFGameServerNet_ServerPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFGameServerNet_ServerPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFGameServerNet_ServerPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCGameServerNet_ServerModule.o $(OBJDIR_DEBUG_X64)/NFGameServerNet_ServerPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFGameServerPlugin/makefile b/NFServer/NFGameServerPlugin/makefile index 9099a407ac..3735a6853b 100644 --- a/NFServer/NFGameServerPlugin/makefile +++ b/NFServer/NFGameServerPlugin/makefile @@ -1,147 +1,136 @@ -#------------------------------------------------------------------------------# -# This makefile was generated by 'cbp2make' tool rev.147 # -#------------------------------------------------------------------------------# - - -WORKDIR = `pwd` - -CC = gcc -CXX = g++ -AR = ar -LD = g++ -WINDRES = windres - -INC = -CFLAGS = -RESINC = -LIBDIR = -LIB = -LDFLAGS = -SolutionDir = ../../ - -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE -RESINC_DEBUG_X64 = $(RESINC) -RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ -LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a -LDFLAGS_DEBUG_X64 = $(LDFLAGS) -OBJDIR_DEBUG_X64 = .objs -DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFGameServerPlugin_d.so - -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ -CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE -RESINC_RELEASE_X64 = $(RESINC) -RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ -LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a -LDFLAGS_RELEASE_X64 = $(LDFLAGS) -OBJDIR_RELEASE_X64 = .objs -DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFGameServerPlugin.so - -OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/dllmain.o $(OBJDIR_DEBUG_X64)/NFCPropertyTrailModule.o $(OBJDIR_DEBUG_X64)/NFGameServerPlugin.o $(OBJDIR_DEBUG_X64)/NFCSceneProcessModule.o $(OBJDIR_DEBUG_X64)/NFCPropertyModule.o $(OBJDIR_DEBUG_X64)/NFCDataProcessModule.o $(OBJDIR_DEBUG_X64)/NFCPropertyConfigModule.o $(OBJDIR_DEBUG_X64)/NFCPVPModule.o $(OBJDIR_DEBUG_X64)/NFCLevelModule.o $(OBJDIR_DEBUG_X64)/NFCGameServerModule.o - -OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/dllmain.o $(OBJDIR_RELEASE_X64)/NFCPropertyTrailModule.o $(OBJDIR_RELEASE_X64)/NFGameServerPlugin.o $(OBJDIR_RELEASE_X64)/NFCSceneProcessModule.o $(OBJDIR_RELEASE_X64)/NFCPropertyModule.o $(OBJDIR_RELEASE_X64)/NFCDataProcessModule.o $(OBJDIR_RELEASE_X64)/NFCPropertyConfigModule.o $(OBJDIR_RELEASE_X64)/NFCPVPModule.o $(OBJDIR_RELEASE_X64)/NFCLevelModule.o $(OBJDIR_RELEASE_X64)/NFCGameServerModule.o - -all: debug_x64 release_x64 - -clean: clean_debug_x64 clean_release_x64 - -before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug - test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) - -after_debug_x64: - cp -f $(SolutionDir)/_Out/Comm/Debug/NFGameServerPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFGameServer1/ - -debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 - -out_debug_x64: before_debug_x64 $(OBJ_DEBUG_X64) $(DEP_DEBUG_X64) - $(LD) -shared $(LIBDIR_DEBUG_X64) $(OBJ_DEBUG_X64) -o $(OUT_DEBUG_X64) $(LDFLAGS_DEBUG_X64) $(LIB_DEBUG_X64) - -$(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c dllmain.cpp -o $(OBJDIR_DEBUG_X64)/dllmain.o - -$(OBJDIR_DEBUG_X64)/NFCPropertyTrailModule.o: NFCPropertyTrailModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCPropertyTrailModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCPropertyTrailModule.o - -$(OBJDIR_DEBUG_X64)/NFGameServerPlugin.o: NFGameServerPlugin.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFGameServerPlugin.cpp -o $(OBJDIR_DEBUG_X64)/NFGameServerPlugin.o - -$(OBJDIR_DEBUG_X64)/NFCSceneProcessModule.o: NFCSceneProcessModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCSceneProcessModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCSceneProcessModule.o - -$(OBJDIR_DEBUG_X64)/NFCPropertyModule.o: NFCPropertyModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCPropertyModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCPropertyModule.o - -$(OBJDIR_DEBUG_X64)/NFCDataProcessModule.o: NFCDataProcessModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCDataProcessModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCDataProcessModule.o - -$(OBJDIR_DEBUG_X64)/NFCPropertyConfigModule.o: NFCPropertyConfigModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCPropertyConfigModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCPropertyConfigModule.o - -$(OBJDIR_DEBUG_X64)/NFCPVPModule.o: NFCPVPModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCPVPModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCPVPModule.o - -$(OBJDIR_DEBUG_X64)/NFCLevelModule.o: NFCLevelModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCLevelModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCLevelModule.o - -$(OBJDIR_DEBUG_X64)/NFCGameServerModule.o: NFCGameServerModule.cpp - $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCGameServerModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCGameServerModule.o - -clean_debug_x64: - rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug - rm -rf $(OBJDIR_DEBUG_X64) - -before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release - test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) - -after_release_x64: - cp -f $(SolutionDir)/_Out/Comm/Release/NFGameServerPlugin.so $(SolutionDir)/_Out/Server/Release/NFGameServer1/ - -release_x64: before_release_x64 out_release_x64 after_release_x64 - -out_release_x64: before_release_x64 $(OBJ_RELEASE_X64) $(DEP_RELEASE_X64) - $(LD) -shared $(LIBDIR_RELEASE_X64) $(OBJ_RELEASE_X64) -o $(OUT_RELEASE_X64) $(LDFLAGS_RELEASE_X64) $(LIB_RELEASE_X64) - -$(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c dllmain.cpp -o $(OBJDIR_RELEASE_X64)/dllmain.o - -$(OBJDIR_RELEASE_X64)/NFCPropertyTrailModule.o: NFCPropertyTrailModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCPropertyTrailModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCPropertyTrailModule.o - -$(OBJDIR_RELEASE_X64)/NFGameServerPlugin.o: NFGameServerPlugin.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFGameServerPlugin.cpp -o $(OBJDIR_RELEASE_X64)/NFGameServerPlugin.o - -$(OBJDIR_RELEASE_X64)/NFCSceneProcessModule.o: NFCSceneProcessModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCSceneProcessModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCSceneProcessModule.o - -$(OBJDIR_RELEASE_X64)/NFCPropertyModule.o: NFCPropertyModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCPropertyModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCPropertyModule.o - -$(OBJDIR_RELEASE_X64)/NFCDataProcessModule.o: NFCDataProcessModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCDataProcessModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCDataProcessModule.o - -$(OBJDIR_RELEASE_X64)/NFCPropertyConfigModule.o: NFCPropertyConfigModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCPropertyConfigModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCPropertyConfigModule.o - -$(OBJDIR_RELEASE_X64)/NFCPVPModule.o: NFCPVPModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCPVPModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCPVPModule.o - -$(OBJDIR_RELEASE_X64)/NFCLevelModule.o: NFCLevelModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCLevelModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCLevelModule.o - -$(OBJDIR_RELEASE_X64)/NFCGameServerModule.o: NFCGameServerModule.cpp - $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCGameServerModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCGameServerModule.o - -clean_release_x64: - rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release - rm -rf $(OBJDIR_RELEASE_X64) - -.PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 - +#------------------------------------------------------------------------------# +# This makefile was generated by 'cbp2make' tool rev.147 # +#------------------------------------------------------------------------------# + + +WORKDIR = `pwd` + +CC = gcc +CXX = g++ +AR = ar +LD = g++ +WINDRES = windres + +INC = +CFLAGS = +RESINC = +LIBDIR = +LIB = +LDFLAGS = +SolutionDir = ../../ + + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ +CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE +RESINC_DEBUG_X64 = $(RESINC) +RCFLAGS_DEBUG_X64 = $(RCFLAGS) +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ +LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a +LDFLAGS_DEBUG_X64 = $(LDFLAGS) +OBJDIR_DEBUG_X64 = .objs +DEP_DEBUG_X64 = +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFGameServerPlugin_d.so + +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ +CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE +RESINC_RELEASE_X64 = $(RESINC) +RCFLAGS_RELEASE_X64 = $(RCFLAGS) +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ +LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a +LDFLAGS_RELEASE_X64 = $(LDFLAGS) +OBJDIR_RELEASE_X64 = .objs +DEP_RELEASE_X64 = +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFGameServerPlugin.so + +OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCGameServerModule.o $(OBJDIR_DEBUG_X64)/NFCLevelModule.o $(OBJDIR_DEBUG_X64)/NFCPropertyConfigModule.o $(OBJDIR_DEBUG_X64)/NFCPropertyModule.o $(OBJDIR_DEBUG_X64)/NFCSceneProcessModule.o $(OBJDIR_DEBUG_X64)/NFGameServerPlugin.o $(OBJDIR_DEBUG_X64)/NFCPropertyTrailModule.o $(OBJDIR_DEBUG_X64)/dllmain.o + +OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCGameServerModule.o $(OBJDIR_RELEASE_X64)/NFCLevelModule.o $(OBJDIR_RELEASE_X64)/NFCPropertyConfigModule.o $(OBJDIR_RELEASE_X64)/NFCPropertyModule.o $(OBJDIR_RELEASE_X64)/NFCSceneProcessModule.o $(OBJDIR_RELEASE_X64)/NFGameServerPlugin.o $(OBJDIR_RELEASE_X64)/NFCPropertyTrailModule.o $(OBJDIR_RELEASE_X64)/dllmain.o + +all: debug_x64 release_x64 + +clean: clean_debug_x64 clean_release_x64 + +before_debug_x64: + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug + test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) + +after_debug_x64: + cp -f $(SolutionDir)/_Out/Comm/Debug/NFGameServerPlugin_d.so $(SolutionDir)/_Out/Server/Debug/NFGameServer1/ + +debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 + +out_debug_x64: before_debug_x64 $(OBJ_DEBUG_X64) $(DEP_DEBUG_X64) + $(LD) -shared $(LIBDIR_DEBUG_X64) $(OBJ_DEBUG_X64) -o $(OUT_DEBUG_X64) $(LDFLAGS_DEBUG_X64) $(LIB_DEBUG_X64) + +$(OBJDIR_DEBUG_X64)/NFCGameServerModule.o: NFCGameServerModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCGameServerModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCGameServerModule.o + +$(OBJDIR_DEBUG_X64)/NFCLevelModule.o: NFCLevelModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCLevelModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCLevelModule.o + +$(OBJDIR_DEBUG_X64)/NFCPropertyConfigModule.o: NFCPropertyConfigModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCPropertyConfigModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCPropertyConfigModule.o + +$(OBJDIR_DEBUG_X64)/NFCPropertyModule.o: NFCPropertyModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCPropertyModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCPropertyModule.o + +$(OBJDIR_DEBUG_X64)/NFCSceneProcessModule.o: NFCSceneProcessModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCSceneProcessModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCSceneProcessModule.o + +$(OBJDIR_DEBUG_X64)/NFGameServerPlugin.o: NFGameServerPlugin.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFGameServerPlugin.cpp -o $(OBJDIR_DEBUG_X64)/NFGameServerPlugin.o + +$(OBJDIR_DEBUG_X64)/NFCPropertyTrailModule.o: NFCPropertyTrailModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCPropertyTrailModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCPropertyTrailModule.o + +$(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c dllmain.cpp -o $(OBJDIR_DEBUG_X64)/dllmain.o + +clean_debug_x64: + rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug + rm -rf $(OBJDIR_DEBUG_X64) + +before_release_x64: + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release + test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) + +after_release_x64: + cp -f $(SolutionDir)/_Out/Comm/Release/NFGameServerPlugin.so $(SolutionDir)/_Out/Server/Release/NFGameServer1/ + +release_x64: before_release_x64 out_release_x64 after_release_x64 + +out_release_x64: before_release_x64 $(OBJ_RELEASE_X64) $(DEP_RELEASE_X64) + $(LD) -shared $(LIBDIR_RELEASE_X64) $(OBJ_RELEASE_X64) -o $(OUT_RELEASE_X64) $(LDFLAGS_RELEASE_X64) $(LIB_RELEASE_X64) + +$(OBJDIR_RELEASE_X64)/NFCGameServerModule.o: NFCGameServerModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCGameServerModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCGameServerModule.o + +$(OBJDIR_RELEASE_X64)/NFCLevelModule.o: NFCLevelModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCLevelModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCLevelModule.o + +$(OBJDIR_RELEASE_X64)/NFCPropertyConfigModule.o: NFCPropertyConfigModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCPropertyConfigModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCPropertyConfigModule.o + +$(OBJDIR_RELEASE_X64)/NFCPropertyModule.o: NFCPropertyModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCPropertyModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCPropertyModule.o + +$(OBJDIR_RELEASE_X64)/NFCSceneProcessModule.o: NFCSceneProcessModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCSceneProcessModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCSceneProcessModule.o + +$(OBJDIR_RELEASE_X64)/NFGameServerPlugin.o: NFGameServerPlugin.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFGameServerPlugin.cpp -o $(OBJDIR_RELEASE_X64)/NFGameServerPlugin.o + +$(OBJDIR_RELEASE_X64)/NFCPropertyTrailModule.o: NFCPropertyTrailModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCPropertyTrailModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCPropertyTrailModule.o + +$(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c dllmain.cpp -o $(OBJDIR_RELEASE_X64)/dllmain.o + +clean_release_x64: + rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) + rm -rf \$\(SolutionDir\)/_Out/Comm/Release + rm -rf $(OBJDIR_RELEASE_X64) + +.PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 + diff --git a/NFServer/NFLoginLogicPlugin/makefile b/NFServer/NFLoginLogicPlugin/makefile index c298b2fd0b..1af07bebcd 100644 --- a/NFServer/NFLoginLogicPlugin/makefile +++ b/NFServer/NFLoginLogicPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/mysql/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFLoginLogicPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFLoginLogicPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/mysql/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFLoginLogicPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFLoginLogicPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCLoginLogicModule.o $(OBJDIR_DEBUG_X64)/NFLoginLogicPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFLoginNet_ClientPlugin/makefile b/NFServer/NFLoginNet_ClientPlugin/makefile index f2462ebd34..0ae7fd2d58 100644 --- a/NFServer/NFLoginNet_ClientPlugin/makefile +++ b/NFServer/NFLoginNet_ClientPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFLoginNet_ClientPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFLoginNet_ClientPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFLoginNet_ClientPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFLoginNet_ClientPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCLoginToMasterModule.o $(OBJDIR_DEBUG_X64)/NFLoginNet_ClientPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFLoginNet_ServerPlugin/makefile b/NFServer/NFLoginNet_ServerPlugin/makefile index cf9abd1a60..265fbe3f3d 100644 --- a/NFServer/NFLoginNet_ServerPlugin/makefile +++ b/NFServer/NFLoginNet_ServerPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFLoginNet_ServerPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFLoginNet_ServerPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFLoginNet_ServerPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFLoginNet_ServerPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCLoginNet_ServerModule.o $(OBJDIR_DEBUG_X64)/NFLoginNet_ServerPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFMasterNet_ServerPlugin/makefile b/NFServer/NFMasterNet_ServerPlugin/makefile index 2c8e4f1388..08bd4fba1f 100644 --- a/NFServer/NFMasterNet_ServerPlugin/makefile +++ b/NFServer/NFMasterNet_ServerPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -fPIC -g -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFMasterNet_ServerPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFMasterNet_ServerPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFMasterNet_ServerPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFMasterNet_ServerPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCMasterNet_ServerModule.o $(OBJDIR_DEBUG_X64)/NFMasterNet_ServerPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFMasterServerPlugin/makefile b/NFServer/NFMasterServerPlugin/makefile index dd7be7de09..f661ca2714 100644 --- a/NFServer/NFMasterServerPlugin/makefile +++ b/NFServer/NFMasterServerPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFMasterServerPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFMasterServerPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFMasterServerPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFMasterServerPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCMasterModule.o $(OBJDIR_DEBUG_X64)/NFMasterServerPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFProxyServerNet_ClientPlugin/makefile b/NFServer/NFProxyServerNet_ClientPlugin/makefile index 94ba0d8db5..94b47b2774 100644 --- a/NFServer/NFProxyServerNet_ClientPlugin/makefile +++ b/NFServer/NFProxyServerNet_ClientPlugin/makefile @@ -19,38 +19,39 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFProxyServerNet_ClientPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFProxyServerNet_ClientPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFProxyServerNet_ClientPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFProxyServerNet_ClientPlugin.so -OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCProxyServerToWorldModule.o $(OBJDIR_DEBUG_X64)/NFProxyServerNet_ClientPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o +OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCProxyServerToGameModule.o $(OBJDIR_DEBUG_X64)/NFCProxyServerToWorldModule.o $(OBJDIR_DEBUG_X64)/NFProxyServerNet_ClientPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o -OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCProxyServerToWorldModule.o $(OBJDIR_RELEASE_X64)/NFProxyServerNet_ClientPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o +OBJ_RELEASE_X64 = $(OBJDIR_RELEASE_X64)/NFCProxyServerToGameModule.o $(OBJDIR_RELEASE_X64)/NFCProxyServerToWorldModule.o $(OBJDIR_RELEASE_X64)/NFProxyServerNet_ClientPlugin.o $(OBJDIR_RELEASE_X64)/dllmain.o all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -61,6 +62,9 @@ debug_x64: before_debug_x64 out_debug_x64 after_debug_x64 out_debug_x64: before_debug_x64 $(OBJ_DEBUG_X64) $(DEP_DEBUG_X64) $(LD) -shared $(LIBDIR_DEBUG_X64) $(OBJ_DEBUG_X64) -o $(OUT_DEBUG_X64) $(LDFLAGS_DEBUG_X64) $(LIB_DEBUG_X64) +$(OBJDIR_DEBUG_X64)/NFCProxyServerToGameModule.o: NFCProxyServerToGameModule.cpp + $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCProxyServerToGameModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCProxyServerToGameModule.o + $(OBJDIR_DEBUG_X64)/NFCProxyServerToWorldModule.o: NFCProxyServerToWorldModule.cpp $(CXX) $(CFLAGS_DEBUG_X64) $(INC_DEBUG_X64) -c NFCProxyServerToWorldModule.cpp -o $(OBJDIR_DEBUG_X64)/NFCProxyServerToWorldModule.o @@ -72,11 +76,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -87,6 +91,9 @@ release_x64: before_release_x64 out_release_x64 after_release_x64 out_release_x64: before_release_x64 $(OBJ_RELEASE_X64) $(DEP_RELEASE_X64) $(LD) -shared $(LIBDIR_RELEASE_X64) $(OBJ_RELEASE_X64) -o $(OUT_RELEASE_X64) $(LDFLAGS_RELEASE_X64) $(LIB_RELEASE_X64) +$(OBJDIR_RELEASE_X64)/NFCProxyServerToGameModule.o: NFCProxyServerToGameModule.cpp + $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCProxyServerToGameModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCProxyServerToGameModule.o + $(OBJDIR_RELEASE_X64)/NFCProxyServerToWorldModule.o: NFCProxyServerToWorldModule.cpp $(CXX) $(CFLAGS_RELEASE_X64) $(INC_RELEASE_X64) -c NFCProxyServerToWorldModule.cpp -o $(OBJDIR_RELEASE_X64)/NFCProxyServerToWorldModule.o @@ -98,7 +105,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFProxyServerNet_ServerPlugin/makefile b/NFServer/NFProxyServerNet_ServerPlugin/makefile index 003babd137..58a0af619b 100644 --- a/NFServer/NFProxyServerNet_ServerPlugin/makefile +++ b/NFServer/NFProxyServerNet_ServerPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFProxyServerNet_ServerPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFProxyServerNet_ServerPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFProxyServerNet_ServerPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFProxyServerNet_ServerPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCProxyServerNet_ServerModule.o $(OBJDIR_DEBUG_X64)/NFProxyServerNet_ServerPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFProxyServerPlugin/makefile b/NFServer/NFProxyServerPlugin/makefile index 7e6718518c..6a5ae11445 100644 --- a/NFServer/NFProxyServerPlugin/makefile +++ b/NFServer/NFProxyServerPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFProxyPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFProxyPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFProxyPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFProxyPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCProxyLogicModule.o $(OBJDIR_DEBUG_X64)/NFCProxyPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFWorldLogicPlugin/makefile b/NFServer/NFWorldLogicPlugin/makefile index 2d3fc73c61..fe8c5e2982 100644 --- a/NFServer/NFWorldLogicPlugin/makefile +++ b/NFServer/NFWorldLogicPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFWorldLogicPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFWorldLogicPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFWorldLogicPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFWorldLogicPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCWorldLogicModule.o $(OBJDIR_DEBUG_X64)/NFWorldLogicPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFWorldNet_ClientPlugin/makefile b/NFServer/NFWorldNet_ClientPlugin/makefile index d823d931d8..03fb67b4bf 100644 --- a/NFServer/NFWorldNet_ClientPlugin/makefile +++ b/NFServer/NFWorldNet_ClientPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -g -fPIC -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFWorldNet_ClientPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFWorldNet_ClientPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFWorldNet_ClientPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFWorldNet_ClientPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCWorldToMasterModule.o $(OBJDIR_DEBUG_X64)/NFWorldNet_ClientPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/NFServer/NFWorldNet_ServerPlugin/makefile b/NFServer/NFWorldNet_ServerPlugin/makefile index 78e8ab0f01..52a186c8cd 100644 --- a/NFServer/NFWorldNet_ServerPlugin/makefile +++ b/NFServer/NFWorldNet_ServerPlugin/makefile @@ -19,27 +19,28 @@ LIB = LDFLAGS = SolutionDir = ../../ -INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ + +INC_DEBUG_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/mysql/ CFLAGS_DEBUG_X64 = $(CFLAGS) -std=c++11 -fPIC -g -D_DEBUG -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_DEBUG_X64 = $(RESINC) RCFLAGS_DEBUG_X64 = $(RCFLAGS) -LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_DEBUG_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Debug/ -L$(SolutionDir)/Dependencies/lib/Debug/ LIB_DEBUG_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Debug/NFMessageDefine_d.a $(SolutionDir)/_Out/Comm/Debug/NFNet_d.a $(SolutionDir)/Dependencies/lib/Debug/libevent.a $(SolutionDir)/Dependencies/lib/Debug/libevent_core.a $(SolutionDir)/Dependencies/lib/Debug/libprotobuf.a LDFLAGS_DEBUG_X64 = $(LDFLAGS) OBJDIR_DEBUG_X64 = .objs DEP_DEBUG_X64 = -OUT_DEBUG_X64 = $(SolutionDir)/_Out/Comm/Debug/NFWorldNet_ServerPlugin_d.so +OUT_DEBUG_X64 = \$\(SolutionDir\)/_Out/Comm/Debug/NFWorldNet_ServerPlugin_d.so -INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/boost_1_53_0/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/include/ -I$(SolutionDir)/Dependencies/libevent-2.0.21-stable/compat/ -I$(SolutionDir)/Dependencies/protobuf-2.5.0/src/ -I$(SolutionDir)/Dependencies/Theron-6.00.01/Include/ +INC_RELEASE_X64 = $(INC) -I$(SolutionDir) -I$(SolutionDir)/Dependencies/ -I$(SolutionDir)/Dependencies/libevent/ -I$(SolutionDir)/Dependencies/libevent/include/ -I$(SolutionDir)/Dependencies/libevent/compat/ -I$(SolutionDir)/Dependencies/protobuf/src/ -I$(SolutionDir)/Dependencies/Theron/Include/ -I$(SolutionDir)/Dependencies/mysql/ CFLAGS_RELEASE_X64 = $(CFLAGS) -std=c++11 -fPIC -D_USRDLL -DELPP_NO_DEFAULT_LOG_FILE RESINC_RELEASE_X64 = $(RESINC) RCFLAGS_RELEASE_X64 = $(RCFLAGS) -LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ -L$(SolutionDir)/Dependencies/boost_1_53_0/stage/lib/x64/gcc/ +LIBDIR_RELEASE_X64 = $(LIBDIR) -L$(SolutionDir)/_Out/Comm/Release/ -L$(SolutionDir)/Dependencies/lib/Release/ LIB_RELEASE_X64 = $(LIB)$(SolutionDir)/_Out/Comm/Release/NFMessageDefine.a $(SolutionDir)/_Out/Comm/Release/NFNet.a $(SolutionDir)/Dependencies/lib/Release/libevent.a $(SolutionDir)/Dependencies/lib/Release/libevent_core.a $(SolutionDir)/Dependencies/lib/Release/libprotobuf.a LDFLAGS_RELEASE_X64 = $(LDFLAGS) OBJDIR_RELEASE_X64 = .objs DEP_RELEASE_X64 = -OUT_RELEASE_X64 = $(SolutionDir)/_Out/Comm/Release/NFWorldNet_ServerPlugin.so +OUT_RELEASE_X64 = \$\(SolutionDir\)/_Out/Comm/Release/NFWorldNet_ServerPlugin.so OBJ_DEBUG_X64 = $(OBJDIR_DEBUG_X64)/NFCWorldNet_ServerModule.o $(OBJDIR_DEBUG_X64)/NFWorldNet_ServerPlugin.o $(OBJDIR_DEBUG_X64)/dllmain.o @@ -50,7 +51,7 @@ all: debug_x64 release_x64 clean: clean_debug_x64 clean_release_x64 before_debug_x64: - test -d $(SolutionDir)/_Out/Comm/Debug || mkdir -p $(SolutionDir)/_Out/Comm/Debug + test -d \$\(SolutionDir\)/_Out/Comm/Debug || mkdir -p \$\(SolutionDir\)/_Out/Comm/Debug test -d $(OBJDIR_DEBUG_X64) || mkdir -p $(OBJDIR_DEBUG_X64) after_debug_x64: @@ -72,11 +73,11 @@ $(OBJDIR_DEBUG_X64)/dllmain.o: dllmain.cpp clean_debug_x64: rm -f $(OBJ_DEBUG_X64) $(OUT_DEBUG_X64) - rm -rf $(SolutionDir)/_Out/Comm/Debug + rm -rf \$\(SolutionDir\)/_Out/Comm/Debug rm -rf $(OBJDIR_DEBUG_X64) before_release_x64: - test -d $(SolutionDir)/_Out/Comm/Release || mkdir -p $(SolutionDir)/_Out/Comm/Release + test -d \$\(SolutionDir\)/_Out/Comm/Release || mkdir -p \$\(SolutionDir\)/_Out/Comm/Release test -d $(OBJDIR_RELEASE_X64) || mkdir -p $(OBJDIR_RELEASE_X64) after_release_x64: @@ -98,7 +99,7 @@ $(OBJDIR_RELEASE_X64)/dllmain.o: dllmain.cpp clean_release_x64: rm -f $(OBJ_RELEASE_X64) $(OUT_RELEASE_X64) - rm -rf $(SolutionDir)/_Out/Comm/Release + rm -rf \$\(SolutionDir\)/_Out/Comm/Release rm -rf $(OBJDIR_RELEASE_X64) .PHONY: before_debug_x64 after_debug_x64 clean_debug_x64 before_release_x64 after_release_x64 clean_release_x64 diff --git a/Tool/cbp2make.linux-x86_64 b/Tool/cbp2make.linux-x86_64 new file mode 100755 index 0000000000..af1e95881a Binary files /dev/null and b/Tool/cbp2make.linux-x86_64 differ diff --git a/install.sh b/install.sh index 58c4f0979e..d058cc03f7 100755 --- a/install.sh +++ b/install.sh @@ -3,6 +3,11 @@ cd ./Dependencies chmod -R 755 build_dep.sh ./build_dep.sh +cd ../ +pwd + # generate makefile chmod -R 755 Build4Makefile.sh -./Build4Makefile.sh \ No newline at end of file +./Build4Makefile.sh + +pwd