modify:support macos now

Author: xengine-qyt

XEngine_Source/MQCore_ConfigModule/Makefile

@@ -1,19 +1,30 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
 LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
 LIB = -ljsoncpp
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = Config_Json.o pch.o
 
+ifeq ($(shell uname),Darwin)
+	SHAREDLL = dylib
+	SHAREFLAG = -dynamiclib
+	LOADSO = 
+else
+	SHAREDLL = so
+	SHAREFLAG = -shared
+endif
+
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2 
 DEBUG = 
 else
-FLAGS = -c -lc_p
-DEBUG = -g -pg 
+FLAGS = -c
+DEBUG = -g
 endif
 
 ifeq ($(UNICODE),1)
@@ -24,7 +35,7 @@ endif
 
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_ConfigModule.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_ConfigModule.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 Config_Json.o:./Config_Json/Config_Json.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Config_Json/Config_Json.cpp 
@@ -34,12 +45,12 @@ pch.o:./pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libMQCore_ConfigModule.so
-	cp ./libMQCore_ConfigModule.so ../../XEngine_Release/libMQCore_ConfigModule.so
+InstallSo:./libMQCore_ConfigModule.$(SHAREDLL)
+	cp ./libMQCore_ConfigModule.so ../../XEngine_Release/libMQCore_ConfigModule.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:                                               
 	rm *.o
 CleanMk:                             
-	rm *.so                        
+	rm *.$(SHAREDLL)                        

XEngine_Source/MQCore_DBModule/Makefile

@@ -1,19 +1,30 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./ 
 LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents
 LIB = -lHelpComponents_DataBase
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = DBModule_MQData.o DBModule_MQUser.o pch.o
 
+ifeq ($(shell uname),Darwin)
+	SHAREDLL = dylib
+	SHAREFLAG = -dynamiclib
+	LOADSO = 
+else
+	SHAREDLL = so
+	SHAREFLAG = -shared
+endif
+
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2 
 DEBUG = 
 else
-FLAGS = -c -lc_p
-DEBUG = -g -pg 
+FLAGS = -c
+DEBUG = -g
 endif
 
 ifeq ($(UNICODE),1)
@@ -24,7 +35,7 @@ endif
 
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_DBModule.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_DBModule.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 DBModule_MQData.o:./DBModule_MQData/DBModule_MQData.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./DBModule_MQData/DBModule_MQData.cpp 
@@ -36,12 +47,12 @@ pch.o:./pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libMQCore_DBModule.so
-	cp ./libMQCore_DBModule.so ../../XEngine_Release/libMQCore_DBModule.so
+InstallSo:./libMQCore_DBModule.$(SHAREDLL)
+	cp ./libMQCore_DBModule.so ../../XEngine_Release/libMQCore_DBModule.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:                                               
 	rm *.o
 CleanMk:                             
-	rm *.so                        
+	rm *.$(SHAREDLL)                        

XEngine_Source/MQCore_DDSMessage/Makefile

@@ -1,20 +1,31 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
 FILECENTOS = /etc/redhat-release
 LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L ../XEngine_ThirdPart/jsoncpp
 LIB = -lXEngine_BaseLib 
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = DDSMessage_CommApi.o pch.o
 
+ifeq ($(shell uname),Darwin)
+	SHAREDLL = dylib
+	SHAREFLAG = -dynamiclib
+	LOADSO = 
+else
+	SHAREDLL = so
+	SHAREFLAG = -shared
+endif
+
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2 
 DEBUG = 
 else
-FLAGS = -c -lc_p
-DEBUG = -g -pg 
+FLAGS = -c
+DEBUG = -g
 endif
 
 ifeq ($(UNICODE),1)
@@ -30,7 +41,7 @@ else
 endif
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_DDSMessage.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_DDSMessage.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 DDSMessage_CommApi.o:./DDSMessage_CommApi/DDSMessage_CommApi.cpp                         
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./DDSMessage_CommApi/DDSMessage_CommApi.cpp
@@ -40,13 +51,13 @@ pch.o:./pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libMQCore_DDSMessage.so
-	cp ./libMQCore_DDSMessage.so ../../XEngine_Release/libMQCore_DDSMessage.so
+InstallSo:./libMQCore_DDSMessage.$(SHAREDLL)
+	cp ./libMQCore_DDSMessage.$(SHAREDLL) ../../XEngine_Release/libMQCore_DDSMessage.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:
 	rm *.o                                           
 CleanMk:
-	rm *.so                                         
+	rm *.$(SHAREDLL)                                         
 

XEngine_Source/MQCore_ProtocolModule/Makefile

@@ -1,13 +1,24 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
 LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
 LIB = -ljsoncpp
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = ProtocolModule_Packet.o ProtocolModule_Parse.o pch.o
 
+ifeq ($(shell uname),Darwin)
+	SHAREDLL = dylib
+	SHAREFLAG = -dynamiclib
+	LOADSO = 
+else
+	SHAREDLL = so
+	SHAREFLAG = -shared
+endif
+
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2 
 DEBUG = 
@@ -24,7 +35,7 @@ endif
 
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_ProtocolModule.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_ProtocolModule.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 ProtocolModule_Packet.o:./ProtocolModule_Packet/ProtocolModule_Packet.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./ProtocolModule_Packet/ProtocolModule_Packet.cpp 
@@ -36,12 +47,12 @@ pch.o:./pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libMQCore_ProtocolModule.so
-	cp ./libMQCore_ProtocolModule.so ../../XEngine_Release/libMQCore_ProtocolModule.so
+InstallSo:./libMQCore_ProtocolModule.$(SHAREDLL)
+	cp ./libMQCore_ProtocolModule.$(SHAREDLL) ../../XEngine_Release/libMQCore_ProtocolModule.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:                                               
 	rm *.o
 CleanMk:                             
-	rm *.so                        
+	rm *.$(SHAREDLL)                        

XEngine_Source/MQCore_SessionModule/Makefile

@@ -1,13 +1,24 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./
 LOADBIN = 
 LIB = 
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=
 LIBINCLUDE = SessionModule_Client.o SessionModule_Notify.o pch.o
 
+ifeq ($(shell uname),Darwin)
+	SHAREDLL = dylib
+	SHAREFLAG = -dynamiclib
+	LOADSO = 
+else
+	SHAREDLL = so
+	SHAREFLAG = -shared
+endif
+
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2 
 DEBUG = 
@@ -24,7 +35,7 @@ endif
 
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_SessionModule.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libMQCore_SessionModule.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 SessionModule_Client.o:./SessionModule_Client/SessionModule_Client.cpp             
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./SessionModule_Client/SessionModule_Client.cpp 
@@ -36,12 +47,12 @@ pch.o:./pch.cpp
 
 
 InstallAll:InstallSo 
-InstallSo:./libMQCore_SessionModule.so
-	cp ./libMQCore_SessionModule.so ../../XEngine_Release/libMQCore_SessionModule.so
+InstallSo:./libMQCore_SessionModule.$(SHAREDLL)
+	cp ./libMQCore_SessionModule.$(SHAREDLL) ../../XEngine_Release/libMQCore_SessionModule.$(SHAREDLL)
 
 
 CleanAll:CleanObj CleanMk
 CleanObj:                                               
 	rm *.o
 CleanMk:                             
-	rm *.so                        
+	rm *.$(SHAREDLL)                        

XEngine_Source/XEngine_MQServiceApp/Makefile

@@ -1,14 +1,21 @@
-CC = g++ -Wall
+CC = g++ -Wall -std=c++17
 RELEASE = 0
 UNICODE = 0  
-LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents  \
-          -L ../MQCore_ConfigModule -L ../MQCore_DDSMessage -L ../MQCore_ProtocolModule -L ../MQCore_SessionModule -L ../MQCore_DBModule -L ../XEngine_ThirdPart/jsoncpp
+LOADBIN = 0
 LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_WSProtocol -lRfcComponents_HttpServer \
       -lMQCore_DDSMessage -lMQCore_ConfigModule -lMQCore_ProtocolModule -lMQCore_SessionModule -lMQCore_DBModule -ljsoncpp
-LIBEX = -static-libgcc -ldl -lrt -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=./,--disable-new-dtags
 LIBINCLUDE = MQService_Net.o MQService_Config.o MQService_TCPTask.o MQService_HttpTask.o MQService_WSTask.o MQService_DDSTask.o XEngine_MQServiceApp.o
 
+ifeq ($(shell uname),Darwin)
+	LOADBIN = -L ../MQCore_ConfigModule -L ../MQCore_DDSMessage -L ../MQCore_ProtocolModule -L ../MQCore_SessionModule -L ../MQCore_DBModule -L ../XEngine_ThirdPart/jsoncpp
+	LOADSO = 
+else
+	LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents  \
+	          -L ../MQCore_ConfigModule -L ../MQCore_DDSMessage -L ../MQCore_ProtocolModule -L ../MQCore_SessionModule -L ../MQCore_DBModule -L ../XEngine_ThirdPart/jsoncpp
+endif
+
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2 
 DEBUG = 

XEngine_Source/XEngine_ThirdPart/jsoncpp/Makefile

@@ -1,14 +1,25 @@
 CC = g++ -Wall -std=c++17 -fPIC
+SHAREFLAG = -shared
+SHAREDLL = so
 RELEASE = 0
 UNICODE = 0
 INCLUDE = -I ./
 FILECENTOS = /etc/redhat-release
 LOADBIN = 
 LIB = 
-LIBEX = -static-libgcc -lrt -ldl -lpthread
+LIBEX = -ldl -lpthread
 LOADSO = -Wl,-rpath=
 LIBINCLUDE = json_reader.o json_value.o json_writer.o
 
+ifeq ($(shell uname),Darwin)
+	SHAREDLL = dylib
+	SHAREFLAG = -dynamiclib
+	LOADSO = 
+else
+	SHAREDLL = so
+	SHAREFLAG = -shared
+endif
+
 ifeq ($(RELEASE),1)
 FLAGS = -c -O2
 DEBUG =
@@ -24,7 +35,7 @@ UNICODE =
 endif
 
 all:$(LIBINCLUDE)
-	$(CC) $(DEBUG) $(LIBINCLUDE) -o libjsoncpp.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
+	$(CC) $(DEBUG) $(LIBINCLUDE) -o libjsoncpp.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
 
 json_reader.o:json_reader.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) json_reader.cpp
@@ -34,8 +45,8 @@ json_writer.o:json_writer.cpp
 	$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) json_writer.cpp
 
 InstallAll:InstallSo
-InstallSo:./libjsoncpp.so
-	cp ./libjsoncpp.so ../../../XEngine_Release/libjsoncpp.so
+InstallSo:./libjsoncpp.$(SHAREDLL)
+	cp ./libjsoncpp.$(SHAREDLL) ../../../XEngine_Release/libjsoncpp.$(SHAREDLL)