Skip to content

Commit 3db5720

Browse files
xengine-qytxengine-qyt
committed
modify:support macos now
1 parent f50e391 commit 3db5720

File tree

7 files changed

+121
-50
lines changed

7 files changed

+121
-50
lines changed

‎XEngine_Source/StorageModule_APIHelp/Makefile‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
CC = g++ -Wall -std=c++17 -fPIC
2+
SHAREFLAG = -shared
3+
SHAREDLL = so
24
RELEASE = 0
35
UNICODE = 0
46
INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
5-
LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
6-
LIB = -ljsoncpp
7-
LIBEX = -static-libgcc -lrt -ldl -lpthread
7+
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_Core -L /usr/local/lib/XEngine_Release/XEngine_RfcComponents -L /usr/local/lib/XEngine_Release/XEngine_SystemSdk -L ../XEngine_ThirdPart/jsoncpp
8+
LIB = -lXEngine_BaseLib -lXEngine_OPenSsl -lRfcComponents_HttpServer -lXEngine_SystemApi -ljsoncpp
9+
LIBEX = -ldl -lpthread
810
LOADSO = -Wl,-rpath=./,--disable-new-dtags
911
LIBINCLUDE = APIHelp_Distributed.o APIHelp_Api.o pch.o
1012

13+
ifeq ($(shell uname),Darwin)
14+
SHAREDLL = dylib
15+
SHAREFLAG = -dynamiclib
16+
LOADSO =
17+
else
18+
SHAREDLL = so
19+
SHAREFLAG = -shared
20+
endif
21+
1122
ifeq ($(RELEASE),1)
1223
FLAGS = -c -O2
1324
DEBUG =
1425
else
15-
FLAGS = -c -lc_p
16-
DEBUG = -g -pg
26+
FLAGS = -c
27+
DEBUG = -g
1728
endif
1829

1930
ifeq ($(UNICODE),1)
@@ -24,7 +35,7 @@ endif
2435

2536

2637
all:$(LIBINCLUDE)
27-
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_APIHelp.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
38+
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_APIHelp.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
2839

2940
APIHelp_Distributed.o:./APIHelp_Distributed/APIHelp_Distributed.cpp
3041
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./APIHelp_Distributed/APIHelp_Distributed.cpp
@@ -36,12 +47,12 @@ pch.o:./pch.cpp
3647

3748

3849
InstallAll:InstallSo
39-
InstallSo:./libStorageModule_APIHelp.so
40-
cp ./libStorageModule_APIHelp.so ../../XEngine_Release/libStorageModule_APIHelp.so
50+
InstallSo:./libStorageModule_APIHelp.$(SHAREDLL)
51+
cp ./libStorageModule_APIHelp.$(SHAREDLL) ../../XEngine_Release/libStorageModule_APIHelp.$(SHAREDLL)
4152

4253

4354
CleanAll:CleanObj CleanMk
4455
CleanObj:
4556
rm *.o
4657
CleanMk:
47-
rm *.so
58+
rm *.$(SHAREDLL)

‎XEngine_Source/StorageModule_Config/Makefile‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
CC = g++ -Wall -std=c++17 -fPIC
2+
SHAREFLAG = -shared
3+
SHAREDLL = so
24
RELEASE = 0
35
UNICODE = 0
46
INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
57
LOADBIN = -L ../XEngine_ThirdPart/jsoncpp
68
LIB = -ljsoncpp
7-
LIBEX = -static-libgcc -lrt -ldl -lpthread
9+
LIBEX = -ldl -lpthread
810
LOADSO = -Wl,-rpath=./,--disable-new-dtags
911
LIBINCLUDE = Config_Json.o pch.o
1012

13+
ifeq ($(shell uname),Darwin)
14+
SHAREDLL = dylib
15+
SHAREFLAG = -dynamiclib
16+
LOADSO =
17+
else
18+
SHAREDLL = so
19+
SHAREFLAG = -shared
20+
endif
21+
1122
ifeq ($(RELEASE),1)
1223
FLAGS = -c -O2
1324
DEBUG =
1425
else
15-
FLAGS = -c -lc_p
16-
DEBUG = -g -pg
26+
FLAGS = -c
27+
DEBUG = -g
1728
endif
1829

1930
ifeq ($(UNICODE),1)
@@ -24,7 +35,7 @@ endif
2435

2536

2637
all:$(LIBINCLUDE)
27-
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_Config.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
38+
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_Config.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
2839

2940
Config_Json.o:./Config_Json/Config_Json.cpp
3041
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Config_Json/Config_Json.cpp
@@ -34,12 +45,12 @@ pch.o:./pch.cpp
3445

3546

3647
InstallAll:InstallSo
37-
InstallSo:./libStorageModule_Config.so
38-
cp ./libStorageModule_Config.so ../../XEngine_Release/libStorageModule_Config.so
48+
InstallSo:./libStorageModule_Config.$(SHAREDLL)
49+
cp ./libStorageModule_Config.$(SHAREDLL) ../../XEngine_Release/libStorageModule_Config.$(SHAREDLL)
3950

4051

4152
CleanAll:CleanObj CleanMk
4253
CleanObj:
4354
rm *.o
4455
CleanMk:
45-
rm *.so
56+
rm *.$(SHAREDLL)

‎XEngine_Source/StorageModule_Database/Makefile‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
11
CC = g++ -Wall -std=c++17 -fPIC
2+
SHAREFLAG = -shared
3+
SHAREDLL = so
24
RELEASE = 0
35
UNICODE = 0
46
INCLUDE = -I ./
57
FILECENTOS = /etc/redhat-release
68
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L /usr/local/lib/XEngine_Release/XEngine_HelpComponents
79
LIB = -lXEngine_BaseLib -lHelpComponents_DataBase
8-
LIBEX = -static-libgcc -lrt -ldl
10+
LIBEX = -ldl
911
LOADSO = -Wl,-rpath=./,--disable-new-dtags
1012
LIBINCLUDE = Database_Client.o Database_File.o Database_Help.o pch.o
1113

14+
ifeq ($(shell uname),Darwin)
15+
SHAREDLL = dylib
16+
SHAREFLAG = -dynamiclib
17+
LOADSO =
18+
else
19+
SHAREDLL = so
20+
SHAREFLAG = -shared
21+
endif
22+
1223
ifeq ($(RELEASE),1)
1324
FLAGS = -c -O2
1425
DEBUG =
1526
else
16-
FLAGS = -c -lc_p
17-
DEBUG = -g -pg
27+
FLAGS = -c
28+
DEBUG = -g
1829
endif
1930

2031
ifeq ($(UNICODE),1)
@@ -24,7 +35,7 @@ UNICODE =
2435
endif
2536

2637
all:$(LIBINCLUDE)
27-
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_Database.so -shared $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
38+
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_Database.$(SHAREDLL) $(SHAREFLAG) $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
2839

2940
Database_Client.o:./Database_Client/Database_Client.cpp
3041
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Database_Client/Database_Client.cpp
@@ -38,12 +49,12 @@ pch.o:pch.cpp
3849

3950

4051
InstallAll:InstallSo
41-
InstallSo:./libStorageModule_Database.so
42-
cp ./libStorageModule_Database.so ../../XEngine_Release/libStorageModule_Database.so
52+
InstallSo:./libStorageModule_Database.$(SHAREDLL)
53+
cp ./libStorageModule_Database.$(SHAREDLL) ../../XEngine_Release/libStorageModule_Database.$(SHAREDLL)
4354

4455

4556
CleanAll:CleanObj CleanMk
4657
CleanObj:
4758
rm *.o
4859
CleanMk:
49-
rm *.so
60+
rm *.$(SHAREDLL)

‎XEngine_Source/StorageModule_Protocol/Makefile‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
11
CC = g++ -Wall -std=c++17 -fPIC
2+
SHAREFLAG = -shared
3+
SHAREDLL = so
24
RELEASE = 0
35
UNICODE = 0
46
INCLUDE = -I ./ -I ../XEngine_ThirdPart/jsoncpp
57
FILECENTOS = /etc/redhat-release
68
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib -L ../XEngine_ThirdPart/jsoncpp
79
LIB = -lXEngine_BaseLib -ljsoncpp
8-
LIBEX = -static-libgcc -lrt -ldl
10+
LIBEX = -ldl
911
LOADSO = -Wl,-rpath=./,--disable-new-dtags
1012
LIBINCLUDE = Protocol_StoragePacket.o Protocol_StorageParse.o pch.o
1113

14+
ifeq ($(shell uname),Darwin)
15+
SHAREDLL = dylib
16+
SHAREFLAG = -dynamiclib
17+
LOADSO =
18+
else
19+
SHAREDLL = so
20+
SHAREFLAG = -shared
21+
endif
22+
1223
ifeq ($(RELEASE),1)
1324
FLAGS = -c -O2
1425
DEBUG =
1526
else
16-
FLAGS = -c -lc_p
17-
DEBUG = -g -pg
27+
FLAGS = -c
28+
DEBUG = -g
1829
endif
1930

2031
ifeq ($(UNICODE),1)
@@ -30,7 +41,7 @@ else
3041
endif
3142

3243
all:$(LIBINCLUDE)
33-
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_Protocol.so -shared $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
44+
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_Protocol.$(SHAREDLL) $(SHAREFLAG) $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
3445

3546
Protocol_StoragePacket.o:./Protocol_Packet/Protocol_StoragePacket.cpp
3647
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Protocol_Packet/Protocol_StoragePacket.cpp
@@ -42,12 +53,12 @@ pch.o:pch.cpp
4253

4354

4455
InstallAll:InstallSo
45-
InstallSo:./libStorageModule_Protocol.so
46-
cp ./libStorageModule_Protocol.so ../../XEngine_Release/libStorageModule_Protocol.so
56+
InstallSo:./libStorageModule_Protocol.$(SHAREDLL)
57+
cp ./libStorageModule_Protocol.$(SHAREDLL) ../../XEngine_Release/libStorageModule_Protocol.$(SHAREDLL)
4758

4859

4960
CleanAll:CleanObj CleanMk
5061
CleanObj:
5162
rm *.o
5263
CleanMk:
53-
rm *.so
64+
rm *.$(SHAREDLL)

‎XEngine_Source/StorageModule_Session/Makefile‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
CC = g++ -Wall -std=c++17 -fPIC
2+
SHAREFLAG = -shared
3+
SHAREDLL = so
24
RELEASE = 0
35
UNICODE = 0
46
INCLUDE = -I ./
57
LOADBIN = -L /usr/local/lib/XEngine_Release/XEngine_BaseLib
68
LIB = -lXEngine_BaseLib
7-
LIBEX = -static-libgcc -lrt -ldl -lpthread
9+
LIBEX = -ldl -lpthread
810
LOADSO = -Wl,-rpath=
911
LIBINCLUDE = Session_DLStroage.o Session_UPStroage.o Session_User.o pch.o
1012

13+
ifeq ($(shell uname),Darwin)
14+
SHAREDLL = dylib
15+
SHAREFLAG = -dynamiclib
16+
LOADSO =
17+
else
18+
SHAREDLL = so
19+
SHAREFLAG = -shared
20+
endif
21+
1122
ifeq ($(RELEASE),1)
1223
FLAGS = -c -O2
1324
DEBUG =
1425
else
15-
FLAGS = -c -lc_p
16-
DEBUG = -g -pg
26+
FLAGS = -c
27+
DEBUG = -g
1728
endif
1829

1930
ifeq ($(UNICODE),1)
@@ -24,7 +35,7 @@ endif
2435

2536

2637
all:$(LIBINCLUDE)
27-
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_Session.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
38+
$(CC) $(DEBUG) $(LIBINCLUDE) -o libStorageModule_Session.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
2839

2940
Session_DLStroage.o:./Session_Stroage/Session_DLStroage.cpp
3041
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) ./Session_Stroage/Session_DLStroage.cpp
@@ -38,12 +49,12 @@ pch.o:./pch.cpp
3849

3950

4051
InstallAll:InstallSo
41-
InstallSo:./libStorageModule_Session.so
42-
cp ./libStorageModule_Session.so ../../XEngine_Release/libStorageModule_Session.so
52+
InstallSo:./libStorageModule_Session.$(SHAREDLL)
53+
cp ./libStorageModule_Session.$(SHAREDLL) ../../XEngine_Release/libStorageModule_Session.$(SHAREDLL)
4354

4455

4556
CleanAll:CleanObj CleanMk
4657
CleanObj:
4758
rm *.o
4859
CleanMk:
49-
rm *.so
60+
rm *.$(SHAREDLL)

‎XEngine_Source/XEngine_StorageApp/Makefile‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
1-
CC = g++ -Wall
1+
CC = g++ -Wall -std=c++17
22
RELEASE = 0
33
UNICODE = 0
4-
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 /usr/local/lib/XEngine_Release/XEngine_NetHelp \
5-
-L ../StorageModule_Database -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../XEngine_ThirdPart/jsoncpp
4+
LOADBIN = -L ../StorageModule_Database -L ../StorageModule_Config -L ../StorageModule_Session -L ../StorageModule_APIHelp -L ../StorageModule_Protocol -L ../XEngine_ThirdPart/jsoncpp
65
LIB = -lXEngine_BaseLib -lXEngine_Algorithm -lXEngine_Core -lXEngine_ManagePool -lXEngine_OPenSsl -lXEngine_ProcFile -lXEngine_SystemApi -lHelpComponents_XLog -lHelpComponents_Packets -lRfcComponents_HttpServer -lNetHelp_APIHelp \
76
-lStorageModule_Database -lStorageModule_Config -lStorageModule_Session -lStorageModule_APIHelp -lStorageModule_Protocol \
87
-ljsoncpp
9-
LIBEX = -static-libgcc -ldl -lrt -lpthread
8+
LIBEX = -ldl -lpthread
109
LOADSO = -Wl,-rpath=./,--disable-new-dtags
1110
LIBINCLUDE = StorageApp_Config.o StorageApp_Download.o StorageApp_Network.o StorageApp_Center.o StorageApp_UPLoader.o Storage_TaskPass.o Storage_TaskManage.o Storage_TaskP2p.o XEngine_StorageApp.o
1211

12+
ifeq ($(shell uname),Darwin)
13+
LOADSO =
14+
else
15+
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 /usr/local/lib/XEngine_Release/XEngine_NetHelp
16+
endif
17+
1318
ifeq ($(RELEASE),1)
1419
FLAGS = -c -O2
1520
DEBUG =
1621
else
17-
FLAGS = -c -lc_p
18-
DEBUG = -g -pg
22+
FLAGS = -c
23+
DEBUG = -g
1924
endif
2025

2126
ifeq ($(UNICODE),1)

‎XEngine_Source/XEngine_ThirdPart/jsoncpp/Makefile‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
11
CC = g++ -Wall -std=c++17 -fPIC
2+
SHAREFLAG = -shared
3+
SHAREDLL = so
24
RELEASE = 0
35
UNICODE = 0
46
INCLUDE = -I ./
57
FILECENTOS = /etc/redhat-release
68
LOADBIN =
79
LIB =
8-
LIBEX = -static-libgcc -lrt -ldl -lpthread
10+
LIBEX = -ldl -lpthread
911
LOADSO = -Wl,-rpath=
1012
LIBINCLUDE = json_reader.o json_value.o json_writer.o
1113

14+
ifeq ($(shell uname),Darwin)
15+
SHAREDLL = dylib
16+
SHAREFLAG = -dynamiclib
17+
LOADSO =
18+
else
19+
SHAREDLL = so
20+
SHAREFLAG = -shared
21+
endif
22+
1223
ifeq ($(RELEASE),1)
1324
FLAGS = -c -O2
1425
DEBUG =
1526
else
16-
FLAGS = -c -lc_p
17-
DEBUG = -g -pg
27+
FLAGS = -c
28+
DEBUG = -g
1829
endif
1930

2031
ifeq ($(UNICODE),1)
@@ -24,7 +35,7 @@ UNICODE =
2435
endif
2536

2637
all:$(LIBINCLUDE)
27-
$(CC) $(DEBUG) $(LIBINCLUDE) -o libjsoncpp.so -shared -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
38+
$(CC) $(DEBUG) $(LIBINCLUDE) -o libjsoncpp.$(SHAREDLL) $(SHAREFLAG) -fPIC $(LOADBIN) $(LIB) $(LIBEX) $(LOADSO)
2839

2940
json_reader.o:json_reader.cpp
3041
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) json_reader.cpp
@@ -34,13 +45,13 @@ json_writer.o:json_writer.cpp
3445
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(INCLUDE) json_writer.cpp
3546

3647
InstallAll:InstallSo
37-
InstallSo:./libjsoncpp.so
38-
cp ./libjsoncpp.so ../../../XEngine_Release/libjsoncpp.so
48+
InstallSo:./libjsoncpp.$(SHAREDLL)
49+
cp ./libjsoncpp.$(SHAREDLL) ../../../XEngine_Release/libjsoncpp.$(SHAREDLL)
3950

4051

4152

4253
CleanAll:CleanObj CleanMk
4354
CleanObj:
4455
rm *.o
4556
CleanMk:
46-
rm *.so
57+
rm *.$(SHAREDLL)

0 commit comments

Comments
 (0)