Skip to content

Commit 5f43494

Browse files
committed
fixed:debug build report warn on mac
1 parent b1fa2d3 commit 5f43494

File tree

6 files changed

+47
-61
lines changed

6 files changed

+47
-61
lines changed

XEngine_Source/MQCore_ConfigModule/Makefile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ PLATDIR =
55
FILEEXT =
66
LIBFLAG =
77
RELEASE = 0
8-
UNICODE = 0
98
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
109
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
1110
LIB = -ljsoncpp
@@ -16,14 +15,13 @@ ifeq ($(RELEASE),1)
1615
FLAGS = -c
1716
DEBUG =
1817
else
19-
FLAGS = -c -lc_p
20-
DEBUG = -g -pg
21-
endif
22-
23-
ifeq ($(UNICODE),1)
24-
UNICODE = -D _UNICODE
25-
else
26-
UNICODE =
18+
ifeq ($(PLATFORM),mac)
19+
FLAGS = -c
20+
DEBUG = -g
21+
else
22+
FLAGS = -c -lc_p
23+
DEBUG = -g -pg
24+
endif
2725
endif
2826

2927
ifeq ($(PLATFORM),linux)
@@ -53,10 +51,10 @@ all:$(OBJECTS)
5351
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_ConfigModule.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5452

5553
Config_Json.o:./Config_Json/Config_Json.cpp
56-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./Config_Json/Config_Json.cpp
54+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./Config_Json/Config_Json.cpp
5755

5856
pch.o:./pch.cpp
59-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
57+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
6058

6159

6260
InstallAll:InstallSo

XEngine_Source/MQCore_DBModule/Makefile

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ PLATDIR =
55
FILEEXT =
66
LIBFLAG =
77
RELEASE = 0
8-
UNICODE = 0
98
LOADHDR = -I ./
109
LOADSO =
1110
LIB = -lHelpComponents_DataBase
@@ -16,14 +15,13 @@ ifeq ($(RELEASE),1)
1615
FLAGS = -c
1716
DEBUG =
1817
else
19-
FLAGS = -c -lc_p
20-
DEBUG = -g -pg
21-
endif
22-
23-
ifeq ($(UNICODE),1)
24-
UNICODE = -D _UNICODE
25-
else
26-
UNICODE =
18+
ifeq ($(PLATFORM),mac)
19+
FLAGS = -c
20+
DEBUG = -g
21+
else
22+
FLAGS = -c -lc_p
23+
DEBUG = -g -pg
24+
endif
2725
endif
2826

2927
ifeq ($(PLATFORM),linux)
@@ -53,12 +51,12 @@ all:$(OBJECTS)
5351
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_DBModule.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5452

5553
DBModule_MQData.o:./DBModule_MQData/DBModule_MQData.cpp
56-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./DBModule_MQData/DBModule_MQData.cpp
54+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./DBModule_MQData/DBModule_MQData.cpp
5755
DBModule_MQUser.o:./DBModule_MQUser/DBModule_MQUser.cpp
58-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./DBModule_MQUser/DBModule_MQUser.cpp
56+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./DBModule_MQUser/DBModule_MQUser.cpp
5957

6058
pch.o:./pch.cpp
61-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
59+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
6260

6361

6462
InstallAll:InstallSo

XEngine_Source/MQCore_ProtocolModule/Makefile

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ PLATDIR =
55
FILEEXT =
66
LIBFLAG =
77
RELEASE = 0
8-
UNICODE = 0
98
LOADHDR = -I ./ -I ../XEngine_Depend/XEngine_Module/jsoncpp
109
LOADSO = -L ../XEngine_Depend/XEngine_Module/jsoncpp
1110
LIB = -ljsoncpp
@@ -16,14 +15,13 @@ ifeq ($(RELEASE),1)
1615
FLAGS = -c
1716
DEBUG =
1817
else
19-
FLAGS = -c -lc_p
20-
DEBUG = -g -pg
21-
endif
22-
23-
ifeq ($(UNICODE),1)
24-
UNICODE = -D _UNICODE
25-
else
26-
UNICODE =
18+
ifeq ($(PLATFORM),mac)
19+
FLAGS = -c
20+
DEBUG = -g
21+
else
22+
FLAGS = -c -lc_p
23+
DEBUG = -g -pg
24+
endif
2725
endif
2826

2927
ifeq ($(PLATFORM),linux)
@@ -53,12 +51,12 @@ all:$(OBJECTS)
5351
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_ProtocolModule.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5452

5553
ProtocolModule_Packet.o:./ProtocolModule_Packet/ProtocolModule_Packet.cpp
56-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ProtocolModule_Packet/ProtocolModule_Packet.cpp
54+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./ProtocolModule_Packet/ProtocolModule_Packet.cpp
5755
ProtocolModule_Parse.o:./ProtocolModule_Parse/ProtocolModule_Parse.cpp
58-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./ProtocolModule_Parse/ProtocolModule_Parse.cpp
56+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./ProtocolModule_Parse/ProtocolModule_Parse.cpp
5957

6058
pch.o:./pch.cpp
61-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
59+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
6260

6361

6462
InstallAll:InstallSo

XEngine_Source/MQCore_SessionModule/Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ PLATDIR =
55
FILEEXT =
66
LIBFLAG =
77
RELEASE = 0
8-
UNICODE = 0
98
LOADHDR = -I ./
109
LOADSO =
1110
LIB =
@@ -20,11 +19,6 @@ FLAGS = -c -lc_p
2019
DEBUG = -g -pg
2120
endif
2221

23-
ifeq ($(UNICODE),1)
24-
UNICODE = -D _UNICODE
25-
else
26-
UNICODE =
27-
endif
2822

2923
ifeq ($(PLATFORM),linux)
3024
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
@@ -53,10 +47,10 @@ all:$(OBJECTS)
5347
$(CC) $(DEBUG) $(OBJECTS) -o libMQCore_SessionModule.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5448

5549
SessionModule_Client.o:./SessionModule_Client/SessionModule_Client.cpp
56-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./SessionModule_Client/SessionModule_Client.cpp
50+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./SessionModule_Client/SessionModule_Client.cpp
5751

5852
pch.o:./pch.cpp
59-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./pch.cpp
53+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
6054

6155

6256
InstallAll:InstallSo

XEngine_Source/XEngine_Depend

Submodule XEngine_Depend updated 47 files

XEngine_Source/XEngine_MQServiceApp/Makefile

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ PLATFORM = linux
33
PLATVER =
44
PLATDIR =
55
RELEASE = 0
6-
UNICODE = 0
76
LOADHDR = -I ./
87
LOADSO = -L ../MQCore_ConfigModule -L ../MQCore_ProtocolModule -L ../MQCore_SessionModule -L ../MQCore_DBModule \
98
-L ../XEngine_Depend/XEngine_Module/jsoncpp -L ../XEngine_Depend/XEngine_Module/XEngine_InfoReport
@@ -17,14 +16,13 @@ ifeq ($(RELEASE),1)
1716
FLAGS = -c
1817
DEBUG =
1918
else
20-
FLAGS = -c -lc_p
21-
DEBUG = -g -pg
22-
endif
23-
24-
ifeq ($(UNICODE),1)
25-
UNICODE = -D _UNICODE
26-
else
27-
UNICODE =
19+
ifeq ($(PLATFORM),mac)
20+
FLAGS = -c
21+
DEBUG = -g
22+
else
23+
FLAGS = -c -lc_p
24+
DEBUG = -g -pg
25+
endif
2826
endif
2927

3028
ifeq ($(PLATFORM),linux)
@@ -49,22 +47,22 @@ all:$(OBJECTS)
4947
$(CC) $(DEBUG) $(OBJECTS) -o XEngine_MQServiceApp $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5048

5149
MQService_Net.o:./MQService_Net.cpp
52-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./MQService_Net.cpp
50+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./MQService_Net.cpp
5351
MQService_Config.o:./MQService_Config.cpp
54-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./MQService_Config.cpp
52+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./MQService_Config.cpp
5553
MQService_TCPTask.o:./MQService_TCPTask.cpp
56-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./MQService_TCPTask.cpp
54+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./MQService_TCPTask.cpp
5755
MQService_HttpTask.o:./MQService_HttpTask.cpp
58-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./MQService_HttpTask.cpp
56+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./MQService_HttpTask.cpp
5957
MQService_WSTask.o:./MQService_WSTask.cpp
60-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./MQService_WSTask.cpp
58+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./MQService_WSTask.cpp
6159
MQService_Task.o:./MQService_Task.cpp
62-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./MQService_Task.cpp
60+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./MQService_Task.cpp
6361
MQService_MQTTTask.o:./MQService_MQTTTask.cpp
64-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./MQService_MQTTTask.cpp
62+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./MQService_MQTTTask.cpp
6563

6664
XEngine_MQServiceApp.o:./XEngine_MQServiceApp.cpp
67-
$(CC) $(DEBUG) $(FLAGS) $(UNICODE) $(PLATVER) $(LOADHDR) ./XEngine_MQServiceApp.cpp
65+
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./XEngine_MQServiceApp.cpp
6866

6967

7068
InstallAll:InstallApp

0 commit comments

Comments
 (0)