pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Warning fixes

Browse source
This commit is contained in:
Alex Zolotarev 2014-09-11 02:05:57 -07:00 • committed by Alex Zolotarev
parent 1e25dccd38
commit 5381728948
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/jni/Android.mk
View file

@ -133,7 +133,7 @@ LOCAL_CPP_FEATURES += exceptions rtti
LOCAL_MODULE := mapswithme
LOCAL_STATIC_LIBRARIES := stats_client map gui routing search storage indexer graphics platform anim geometry coding base expat freetype fribidi zlib bzip2 jansson tomcrypt protobuf
LOCAL_CFLAGS := -ffunction-sections -fdata-sections -Wno-psabi -Wno-extern-c-compat
LOCAL_CFLAGS := -ffunction-sections -fdata-sections -Wno-extern-c-compat
ifneq ($(NDK_DEBUG),1)
ifeq ($(PRODUCTION),1)
@ -197,7 +197,7 @@ LOCAL_SRC_FILES := \
nv_thread/nv_thread.cpp \
nv_event/nv_event_queue.cpp \
nv_event/nv_event.cpp \
nv_time/nv_time.cpp
nv_time/nv_time.cpp \
LOCAL_LDLIBS := -llog -lGLESv2

8
common.pri
View file

@ -16,11 +16,9 @@ INCLUDEPATH *= $$ROOT_DIR/3party/boost
CONFIG -= depend_includepath
CONFIG *= c++11
# For old android gcc 4.6
!android* {
QMAKE_CFLAGS *= -Wno-deprecated-register -Wno-unused-local-typedefs
QMAKE_CXXFLAGS *= -Wno-deprecated-register -Wno-unused-local-typedefs
}
QMAKE_CFLAGS *= -Wno-deprecated-register
QMAKE_CXXFLAGS *= -Wno-deprecated-register
# Automatically enable release config for production
CONFIG(production) {

2
search/house_detector.cpp
View file

@ -31,7 +31,7 @@ namespace search
namespace
{
#ifdef DEBUG
#if 0
void Houses2KML(ostream & s, map<search::House, double> const & m)
{
for (map<search::House, double>::const_iterator it = m.begin(); it != m.end(); ++it)