Skip to content

Commit 78622ba

Browse files
committed
compile fixes xcode13
1 parent bb0e1c7 commit 78622ba

File tree

3 files changed

+6
-25
lines changed

3 files changed

+6
-25
lines changed

Makefile

+4-23
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
PLATFORM := $(shell uname)
22

33
ifneq (, $(findstring MINGW, $(PLATFORM)))
4-
TARGETS := WED MeshTool ObjView DSFTool DDSTool ObjConverter \
5-
ac3d XGrinder
4+
TARGETS := WED MeshTool ObjView DSFTool DDSTool XGrinder
65
else
7-
TARGETS := WED MeshTool ObjView DSFTool DDSTool ObjConverter RenderFarm \
8-
ac3d XGrinder RenderFarmUI
6+
TARGETS := WED MeshTool ObjView DSFTool DDSTool RenderFarm XGrinder RenderFarmUI
97
endif
108

11-
.PHONY: $(TARGETS) all clean distclean libs release linkclean release-test \
12-
srpm-head
13-
9+
.PHONY: $(TARGETS) all clean libs release release-test
1410
all: $(TARGETS)
1511

1612
debug:
@@ -34,23 +30,8 @@ libs:
3430
clean:
3531
@$(MAKE) -s -f ./makerules/global/toplevel.mk clean
3632

37-
linkclean:
38-
@$(MAKE) -s -f ./makerules/global/toplevel.mk TARGET=$(target) linkclean
39-
40-
distclean: clean
41-
@$(MAKE) -s -C "./libs" clean
42-
43-
srpm-head:
44-
git archive --format=tar --prefix=xptools/ HEAD^{tree} | bzip2 > xptools.tar.bz2
45-
rpmbuild -ts xptools.tar.bz2
46-
rm -rf xptools.tar.bz2
47-
48-
ifndef rpmbuild
49-
#$(TARGETS): libs
5033
$(TARGETS):
51-
else
52-
$(TARGETS):
53-
endif
5434
@export LD_RUN_PATH='$${ORIGIN}/slib' && \
5535
$(MAKE) -s -f ./makerules/global/toplevel.mk TARGET=$(@) all
5636

37+
:

libs

src/WEDCore/WED_HierarchyUtils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void CollectRecursive(WED_Thing * thing, OutputIterator oi, VisibilityPred visib
7878

7979
if (visibility_pred(thing))
8080
{
81-
if (sClass == "" || sClass == thing->GetClass())
81+
if (*sClass == '\0' || sClass == thing->GetClass())
8282
{
8383
if (take_pred(thing) == true )
8484
{

0 commit comments

Comments
 (0)