Skip to content

Commit 44ba42e

Browse files
committed
update:make file flags build
1 parent 66e9b81 commit 44ba42e

File tree

4 files changed

+40
-20
lines changed

4 files changed

+40
-20
lines changed

XEngine_Module/XEngine_AVPlayer/Makefile

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,31 @@ PLATFORM = linux
33
PLATVER =
44
FILEEXT =
55
LIBFLAG =
6-
RELEASE = 0
7-
UNICODE = 0
86
LOADHDR = -I ./
97
LOADSO =
108
LIB = -lXEngine_BaseLib
119
LIBEX =
1210
OBJECTS = AVPlayer_Video.o AVPlayer_Audio.o pch.o
1311

1412
ifeq ($(RELEASE),1)
15-
FLAGS = -c
13+
FLAGS = -c -D _RELEASE
1614
DEBUG = -O2
1715
else
1816
ifeq ($(PLATFORM),mac)
1917
FLAGS = -c
20-
DEBUG = -g
18+
DEBUG = -g -D _DEBUG
2119
else
2220
FLAGS = -c -lc_p
23-
DEBUG = -g -pg
21+
DEBUG = -g -pg -D _DEBUG
2422
endif
2523
endif
2624

25+
ifeq ($(UNICODE),1)
26+
override UNICODE := -D __UNICODE__
27+
else
28+
override UNICODE := -D __ANSI__
29+
endif
30+
2731
ifeq ($(PLATFORM),linux)
2832
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2933
PLATVER = -D __CENTOS__
@@ -49,12 +53,12 @@ all:$(OBJECTS)
4953
$(CC) $(DEBUG) $(OBJECTS) -o libXEngine_AVPlayer.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
5054

5155
AVPlayer_Video.o:./AVPlayer_Video/AVPlayer_Video.cpp
52-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./AVPlayer_Video/AVPlayer_Video.cpp
56+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) ./AVPlayer_Video/AVPlayer_Video.cpp
5357
AVPlayer_Audio.o:./AVPlayer_Audio/AVPlayer_Audio.cpp
54-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./AVPlayer_Audio/AVPlayer_Audio.cpp
58+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) ./AVPlayer_Audio/AVPlayer_Audio.cpp
5559

5660
pch.o:./pch.cpp
57-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
61+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
5862

5963

6064
CleanAll:CleanObj CleanMk

XEngine_Module/XEngine_InfoReport/Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ PLATFORM = linux
33
PLATVER =
44
FILEEXT =
55
LIBFLAG =
6-
RELEASE = 0
76
LOADHDR = -I ./ -I ../jsoncpp
87
LOADSO = -L ../jsoncpp
98
LIB = -lXEngine_BaseLib -lXEngine_SystemApi -lXClient_APIHelp -ljsoncpp
109
LIBEX =
1110
OBJECTS = InfoReport_APIMachine.o pch.o
1211

1312
ifeq ($(RELEASE),1)
14-
FLAGS = -c
13+
FLAGS = -c -D _RELEASE
1514
DEBUG = -O2
1615
else
1716
ifeq ($(PLATFORM),mac)
@@ -23,6 +22,12 @@ else
2322
endif
2423
endif
2524

25+
ifeq ($(UNICODE),1)
26+
override UNICODE := -D __UNICODE__
27+
else
28+
override UNICODE := -D __ANSI__
29+
endif
30+
2631
ifeq ($(PLATFORM),linux)
2732
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2833
PLATVER = -D __CENTOS__
@@ -46,10 +51,10 @@ all:$(OBJECTS)
4651
$(CC) $(DEBUG) $(OBJECTS) -o libXEngine_InfoReport.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
4752

4853
InfoReport_APIMachine.o:./InfoReport_APIMachine/InfoReport_APIMachine.cpp
49-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./InfoReport_APIMachine/InfoReport_APIMachine.cpp
54+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) ./InfoReport_APIMachine/InfoReport_APIMachine.cpp
5055

5156
pch.o:./pch.cpp
52-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
57+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) ./pch.cpp
5358

5459

5560
CleanAll:CleanObj CleanMk

XEngine_Module/jsoncpp/Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ PLATFORM = linux
33
PLATVER =
44
FILEEXT =
55
LIBFLAG =
6-
RELEASE = 0
76
LOADHDR = -I ./
87
LOADSO = -L
98
LIB =
109
LIBEX =
1110
OBJECTS = json_reader.o json_value.o json_writer.o
1211

1312
ifeq ($(RELEASE),1)
14-
FLAGS = -c
13+
FLAGS = -c -D _RELEASE
1514
DEBUG = -O2
1615
else
1716
ifeq ($(PLATFORM),mac)
@@ -23,6 +22,12 @@ else
2322
endif
2423
endif
2524

25+
ifeq ($(UNICODE),1)
26+
override UNICODE := -D __UNICODE__
27+
else
28+
override UNICODE := -D __ANSI__
29+
endif
30+
2631
ifeq ($(PLATFORM),linux)
2732
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2833
PLATVER = -D __CENTOS__
@@ -46,11 +51,11 @@ all:$(OBJECTS)
4651
$(CC) $(DEBUG) $(OBJECTS) -o libjsoncpp.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
4752

4853
json_reader.o:json_reader.cpp
49-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) json_reader.cpp
54+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) json_reader.cpp
5055
json_value.o:json_value.cpp
51-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) json_value.cpp
56+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) json_value.cpp
5257
json_writer.o:json_writer.cpp
53-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) json_writer.cpp
58+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) json_writer.cpp
5459

5560

5661
CleanAll:CleanObj CleanMk

XEngine_Module/tinyxml2/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LIBEX =
1111
OBJECTS = pch.o tinyxml2.o
1212

1313
ifeq ($(RELEASE),1)
14-
FLAGS = -c
14+
FLAGS = -c -D _RELEASE
1515
DEBUG = -O2
1616
else
1717
ifeq ($(PLATFORM),mac)
@@ -23,6 +23,12 @@ else
2323
endif
2424
endif
2525

26+
ifeq ($(UNICODE),1)
27+
override UNICODE := -D __UNICODE__
28+
else
29+
override UNICODE := -D __ANSI__
30+
endif
31+
2632
ifeq ($(PLATFORM),linux)
2733
ifeq (/etc/redhat-release,$(wildcard /etc/redhat-release))
2834
PLATVER = -D __CENTOS__
@@ -46,9 +52,9 @@ all:$(OBJECTS)
4652
$(CC) $(DEBUG) $(OBJECTS) -o libtinyxml2.$(FILEEXT) $(LIBFLAG) $(LIB) $(LIBEX) $(LOADSO) $(LOADBIN)
4753

4854
pch.o:pch.cpp
49-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) pch.cpp
55+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) pch.cpp
5056
tinyxml2.o:tinyxml2.cpp
51-
$(CC) $(DEBUG) $(FLAGS) $(PLATVER) $(LOADHDR) tinyxml2.cpp
57+
$(CC) $(DEBUG) $(UNICODE) $(FLAGS) $(PLATVER) $(LOADHDR) tinyxml2.cpp
5258

5359
CleanAll:CleanObj CleanMk
5460
CleanObj:

0 commit comments

Comments
 (0)