am 896b9c60: am 57069e59: Merge "Remove Windows AndroidConfig.h." (a65473b0) · Commits · e / os / android_build

core/combo/HOST_windows-x86.mk

+4 −2

Original line number	Diff line number	Diff line
		@@ -33,13 +33,15 @@ $(combo_2nd_arch_prefix)HOST_GLOBAL_LD_DIRS += -Lprebuilts/gcc/linux-x86/host/x8
		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
		# Use C99-compliant printf functions (%zd).
		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
		# Admit to using >= Win2K.
		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D_WIN32_WINNT=0x0500
		# Get 64-bit off_t and related functions.
		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D_FILE_OFFSET_BITS=64

		$(combo_2nd_arch_prefix)HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX)
		$(combo_2nd_arch_prefix)HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX)
		$(combo_2nd_arch_prefix)HOST_AR := $(TOOLS_PREFIX)ar$(TOOLS_EXE_SUFFIX)

		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += \
		-include $(call select-android-config-h,windows)
		$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += \
		--enable-stdcall-fixup

core/combo/HOST_windows-x86_64.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -31,12 +31,13 @@ HOST_GLOBAL_LD_DIRS += -L/usr/amd64-mingw32msvc/lib
		HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
		# Use C99-compliant printf functions (%zd).
		HOST_GLOBAL_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
		# Admit to using >= Win2K.
		HOST_GLOBAL_CFLAGS += -D_WIN32_WINNT=0x0500

		HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX)
		HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX)
		HOST_AR := $(TOOLS_PREFIX)ar$(TOOLS_EXE_SUFFIX)

		HOST_GLOBAL_CFLAGS += -include $(call select-android-config-h,windows)
		HOST_GLOBAL_LDFLAGS += --enable-stdcall-fixup
		ifneq ($(strip $(BUILD_HOST_static)),)
		# Statically-linked binaries are desirable for sandboxed environment

core/combo/include/arch/windows/AndroidConfig.h

deleted100644 → 0

+0 −51

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2005 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef _ANDROID_CONFIG_H
		#define _ANDROID_CONFIG_H

		/*
		* ===========================================================================
		* !!! IMPORTANT !!!
		* ===========================================================================
		*
		* This file is included by ALL C/C++ source files. Don't put anything in
		* here unless you are absolutely certain it can't go anywhere else.
		*
		* Any C++ stuff must be wrapped with "#ifdef __cplusplus". Do not use "//"
		* comments.
		*/

		#ifdef __CYGWIN__
		#error "CYGWIN is unsupported for platform builds"
		#endif

		/*
		* We need to choose between 32-bit and 64-bit off_t. All of our code should
		* agree on the same size. For desktop systems, use 64-bit values,
		* because some of our libraries (e.g. wxWidgets) expect to be built that way.
		*/
		#define _FILE_OFFSET_BITS 64
		#define _LARGEFILE_SOURCE 1

		/*
		* Add any extra platform-specific defines here.
		*/
		#define WIN32 1 /* stock Cygwin doesn't define these */
		#define _WIN32 1
		#define _WIN32_WINNT 0x0500 /* admit to using >= Win2K */

		#endif /_ANDROID_CONFIG_H/