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

Changed path out/release to out/production for production configuration

Browse source
This commit is contained in:
Alex Zolotarev 2011-12-28 05:05:58 +03:00 • committed by Alex Zolotarev
parent 78494f9548
commit e5e1898738
3 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
android/jni/Android.mk
View file

@ -4,10 +4,7 @@ include $(CLEAR_VARS)
#LOCAL_CPP_FEATURES += exceptions rtti
LOCAL_MODULE := mapswithme
#LOCAL_CFLAGS := -DANDROID_NDK \
# -DDISABLE_IMPORTGL
LOCAL_MODULE := mapswithme
LOCAL_CFLAGS := -ffunction-sections -fdata-sections
@ -55,27 +52,24 @@ LOCAL_LDLIBS := -llog -lGLESv1_CM \
LOCAL_LDLIBS += -Wl,--gc-sections
OMIM_CONFIG := release
OMIM_SUBFOLDER := release
ifeq ($(NDK_DEBUG),1)
OMIM_CONFIG := debug
OMIM_SUBFOLDER := debug
else
ifeq ($(PRODUCTION),1)
OMIM_CONFIG := production
LOCAL_CFLAGS += -O3
endif
LOCAL_CFLAGS += -O3
endif
# empty means armv5
OMIM_ABI :=
OMIM_ABI := armeabi
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
OMIM_ABI := -armv7
OMIM_ABI := armeabi-v7a
else
ifeq ($(TARGET_ARCH_ABI),x86)
OMIM_ABI := -x86
OMIM_ABI := x86
endif
endif
LOCAL_LDLIBS += -L../../omim-android-$(OMIM_CONFIG)$(OMIM_ABI)/out/$(OMIM_SUBFOLDER)
LOCAL_LDLIBS += -L../../omim-android-$(OMIM_CONFIG)-$(OMIM_ABI)/out/$(OMIM_CONFIG)
include $(BUILD_SHARED_LIBRARY)

11
common.pri
View file

@ -12,9 +12,18 @@ VERSION = $${VERSION_MAJOR}.$${VERSION_MINOR}
# Additional include directories, common to most projects.
INCLUDEPATH *= $$ROOT_DIR/3party/boost
# Automatically enable release config for production
CONFIG(production) {
CONFIG *= release
}
CONFIG(release, debug|release) {
DEFINES *= RELEASE _RELEASE NDEBUG
CONFIG_NAME = release
CONFIG(production) {
CONFIG_NAME = production
} else {
CONFIG_NAME = release
}
} else {
DEFINES *= DEBUG _DEBUG
CONFIG_NAME = debug

10
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -613,7 +613,7 @@
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D3623240D0F684500981E51 /* MapsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapsAppDelegate.h; sourceTree = "<group>"; };
1D3623250D0F684500981E51 /* MapsAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapsAppDelegate.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
1D6058910D05DD3D006BFB54 /* MapsWithMe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = MapsWithMe.app; path = "MapsWithMeβ.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1D6058910D05DD3D006BFB54 /* MapsWithMe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = MapsWithMe.app; path = "MWM Beta.app"; sourceTree = BUILT_PRODUCTS_DIR; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
288765070DF74369002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
28A0AB4B0D9B1048005BE974 /* Maps_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Maps_Prefix.pch; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
@ -2746,7 +2746,7 @@
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "MapsWithMe-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/release\"";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
@ -2851,7 +2851,7 @@
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "MapsWithMe-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/release\"";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
@ -3004,7 +3004,7 @@
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "MapsWithMe-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/release\"";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
@ -3058,7 +3058,7 @@
HEADER_SEARCH_PATHS = ../../3party/boost;
INFOPLIST_FILE = "MapsWithMe-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/release\"";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\"";
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-Wall";
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";