mirror of
https://github.com/davidgiven/fluxengine.git
synced 2025-10-31 11:17:01 -07:00
Merge pull request #392 from davidgiven/warnings
Fix some minor build glitches and warnings.
This commit is contained in:
1
Makefile
1
Makefile
@@ -60,6 +60,7 @@ export CC = clang
|
|||||||
export CXX = clang++
|
export CXX = clang++
|
||||||
export COBJC = clang
|
export COBJC = clang
|
||||||
export LDFLAGS += -framework IOKit -framework CoreFoundation
|
export LDFLAGS += -framework IOKit -framework CoreFoundation
|
||||||
|
export CFLAGS += -Wno-deprecated-declarations
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -82,6 +82,9 @@ public:
|
|||||||
sectors.push_back(sectorId + i);
|
sectors.push_back(sectorId + i);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return sectors;
|
return sectors;
|
||||||
}
|
}
|
||||||
|
|||||||
11
mkninja.sh
11
mkninja.sh
@@ -149,8 +149,16 @@ buildproto() {
|
|||||||
|
|
||||||
local flags
|
local flags
|
||||||
flags=
|
flags=
|
||||||
|
local deps
|
||||||
|
deps=
|
||||||
while true; do
|
while true; do
|
||||||
case $1 in
|
case $1 in
|
||||||
|
-d)
|
||||||
|
deps="$deps $2"
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
|
||||||
-*)
|
-*)
|
||||||
flags="$flags $1"
|
flags="$flags $1"
|
||||||
shift
|
shift
|
||||||
@@ -174,7 +182,7 @@ buildproto() {
|
|||||||
hfiles="$hfiles $hfile"
|
hfiles="$hfiles $hfile"
|
||||||
done
|
done
|
||||||
|
|
||||||
echo build $cfiles $hfiles $def : proto $@
|
echo "build $cfiles $hfiles $def : proto $@ | $deps"
|
||||||
echo " flags=$flags --cpp_out=$OBJDIR/proto"
|
echo " flags=$flags --cpp_out=$OBJDIR/proto"
|
||||||
echo " def=$def"
|
echo " def=$def"
|
||||||
|
|
||||||
@@ -579,6 +587,7 @@ buildsimpleprogram brother240tool \
|
|||||||
libfmt.a \
|
libfmt.a \
|
||||||
|
|
||||||
buildproto libtestproto.a \
|
buildproto libtestproto.a \
|
||||||
|
-d $OBJDIR/proto/lib/common.pb.h \
|
||||||
tests/testproto.proto \
|
tests/testproto.proto \
|
||||||
|
|
||||||
buildencodedproto $OBJDIR/proto/libtestproto.def TestProto testproto_pb tests/testproto.textpb $OBJDIR/proto/tests/testproto.cc
|
buildencodedproto $OBJDIR/proto/libtestproto.def TestProto testproto_pb tests/testproto.textpb $OBJDIR/proto/tests/testproto.cc
|
||||||
|
|||||||
Reference in New Issue
Block a user