File tree Expand file tree Collapse file tree 4 files changed +40
-20
lines changed
Expand file tree Collapse file tree 4 files changed +40
-20
lines changed Original file line number Diff line number Diff line change @@ -3,27 +3,31 @@ PLATFORM = linux
33PLATVER =
44FILEEXT =
55LIBFLAG =
6- RELEASE = 0
7- UNICODE = 0
86LOADHDR = -I ./
97LOADSO =
108LIB = -lXEngine_BaseLib
119LIBEX =
1210OBJECTS = AVPlayer_Video.o AVPlayer_Audio.o pch.o
1311
1412ifeq ($(RELEASE ) ,1)
15- FLAGS = -c
13+ FLAGS = -c -D _RELEASE
1614DEBUG = -O2
1715else
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
2523endif
2624
25+ ifeq ($(UNICODE ) ,1)
26+ override UNICODE := -D __UNICODE__
27+ else
28+ override UNICODE := -D __ANSI__
29+ endif
30+
2731ifeq ($(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
5155AVPlayer_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
5357AVPlayer_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
5660pch.o :./pch.cpp
57- $(CC ) $(DEBUG ) $(FLAGS ) $(PLATVER ) $(LOADHDR ) ./pch.cpp
61+ $(CC ) $(DEBUG ) $(UNICODE ) $( FLAGS ) $(PLATVER ) $(LOADHDR ) ./pch.cpp
5862
5963
6064CleanAll :CleanObj CleanMk
Original file line number Diff line number Diff line change @@ -3,15 +3,14 @@ PLATFORM = linux
33PLATVER =
44FILEEXT =
55LIBFLAG =
6- RELEASE = 0
76LOADHDR = -I ./ -I ../jsoncpp
87LOADSO = -L ../jsoncpp
98LIB = -lXEngine_BaseLib -lXEngine_SystemApi -lXClient_APIHelp -ljsoncpp
109LIBEX =
1110OBJECTS = InfoReport_APIMachine.o pch.o
1211
1312ifeq ($(RELEASE ) ,1)
14- FLAGS = -c
13+ FLAGS = -c -D _RELEASE
1514DEBUG = -O2
1615else
1716 ifeq ($(PLATFORM),mac)
2322 endif
2423endif
2524
25+ ifeq ($(UNICODE ) ,1)
26+ override UNICODE := -D __UNICODE__
27+ else
28+ override UNICODE := -D __ANSI__
29+ endif
30+
2631ifeq ($(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
4853InfoReport_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
5156pch.o :./pch.cpp
52- $(CC ) $(DEBUG ) $(FLAGS ) $(PLATVER ) $(LOADHDR ) ./pch.cpp
57+ $(CC ) $(DEBUG ) $(UNICODE ) $( FLAGS ) $(PLATVER ) $(LOADHDR ) ./pch.cpp
5358
5459
5560CleanAll :CleanObj CleanMk
Original file line number Diff line number Diff line change @@ -3,15 +3,14 @@ PLATFORM = linux
33PLATVER =
44FILEEXT =
55LIBFLAG =
6- RELEASE = 0
76LOADHDR = -I ./
87LOADSO = -L
98LIB =
109LIBEX =
1110OBJECTS = json_reader.o json_value.o json_writer.o
1211
1312ifeq ($(RELEASE ) ,1)
14- FLAGS = -c
13+ FLAGS = -c -D _RELEASE
1514DEBUG = -O2
1615else
1716 ifeq ($(PLATFORM),mac)
2322 endif
2423endif
2524
25+ ifeq ($(UNICODE ) ,1)
26+ override UNICODE := -D __UNICODE__
27+ else
28+ override UNICODE := -D __ANSI__
29+ endif
30+
2631ifeq ($(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
4853json_reader.o :json_reader.cpp
49- $(CC ) $(DEBUG ) $(FLAGS ) $(PLATVER ) $(LOADHDR ) json_reader.cpp
54+ $(CC ) $(DEBUG ) $(UNICODE ) $( FLAGS ) $(PLATVER ) $(LOADHDR ) json_reader.cpp
5055json_value.o :json_value.cpp
51- $(CC ) $(DEBUG ) $(FLAGS ) $(PLATVER ) $(LOADHDR ) json_value.cpp
56+ $(CC ) $(DEBUG ) $(UNICODE ) $( FLAGS ) $(PLATVER ) $(LOADHDR ) json_value.cpp
5257json_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
5661CleanAll :CleanObj CleanMk
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ LIBEX =
1111OBJECTS = pch.o tinyxml2.o
1212
1313ifeq ($(RELEASE ) ,1)
14- FLAGS = -c
14+ FLAGS = -c -D _RELEASE
1515DEBUG = -O2
1616else
1717 ifeq ($(PLATFORM),mac)
2323 endif
2424endif
2525
26+ ifeq ($(UNICODE ) ,1)
27+ override UNICODE := -D __UNICODE__
28+ else
29+ override UNICODE := -D __ANSI__
30+ endif
31+
2632ifeq ($(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
4854pch.o :pch.cpp
49- $(CC ) $(DEBUG ) $(FLAGS ) $(PLATVER ) $(LOADHDR ) pch.cpp
55+ $(CC ) $(DEBUG ) $(UNICODE ) $( FLAGS ) $(PLATVER ) $(LOADHDR ) pch.cpp
5056tinyxml2.o :tinyxml2.cpp
51- $(CC ) $(DEBUG ) $(FLAGS ) $(PLATVER ) $(LOADHDR ) tinyxml2.cpp
57+ $(CC ) $(DEBUG ) $(UNICODE ) $( FLAGS ) $(PLATVER ) $(LOADHDR ) tinyxml2.cpp
5258
5359CleanAll :CleanObj CleanMk
5460CleanObj :
You can’t perform that action at this time.
0 commit comments