Merge pull request #1432 from mstorsjo/rename-makefiles
Remove the "platform-" prefix from common shared makefiles
This commit is contained in:
commit
452fb868c7
@ -1,5 +1,5 @@
|
||||
ifneq ($(filter %86 x86_64, $(ARCH)),)
|
||||
include $(SRC_PATH)build/platform-x86-common.mk
|
||||
include $(SRC_PATH)build/x86-common.mk
|
||||
endif
|
||||
ifneq ($(filter-out arm64, $(filter arm%, $(ARCH))),)
|
||||
ifeq ($(USE_ASM), Yes)
|
@ -1,4 +1,4 @@
|
||||
include $(SRC_PATH)build/platform-arch.mk
|
||||
include $(SRC_PATH)build/arch.mk
|
||||
ifeq ($(ASM_ARCH), x86)
|
||||
ifeq ($(ENABLE64BIT), Yes)
|
||||
ASMFLAGS += -f win64
|
@ -1,5 +1,5 @@
|
||||
ARCH = arm
|
||||
include $(SRC_PATH)build/platform-arch.mk
|
||||
include $(SRC_PATH)build/arch.mk
|
||||
SHAREDLIBSUFFIX = so
|
||||
NDKLEVEL = 12
|
||||
ifeq ($(ARCH), arm)
|
||||
|
@ -1,4 +1,4 @@
|
||||
include $(SRC_PATH)build/platform-arch.mk
|
||||
include $(SRC_PATH)build/arch.mk
|
||||
SHAREDLIBSUFFIX = dylib
|
||||
SHARED = -dynamiclib
|
||||
CFLAGS += -Wall -fPIC -MMD -MP
|
||||
|
@ -1,4 +1,4 @@
|
||||
include $(SRC_PATH)build/platform-arch.mk
|
||||
include $(SRC_PATH)build/arch.mk
|
||||
SHAREDLIBSUFFIX = so
|
||||
CFLAGS += -fPIC
|
||||
LDFLAGS += -lpthread
|
||||
|
@ -1,4 +1,4 @@
|
||||
include $(SRC_PATH)build/platform-arch.mk
|
||||
include $(SRC_PATH)build/arch.mk
|
||||
SHAREDLIBSUFFIX = so
|
||||
CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP
|
||||
LDFLAGS += -lpthread
|
||||
|
@ -1,4 +1,4 @@
|
||||
include $(SRC_PATH)build/platform-x86-common.mk
|
||||
include $(SRC_PATH)build/x86-common.mk
|
||||
SHAREDLIBSUFFIX = dll
|
||||
CFLAGS += -MMD -MP
|
||||
LDFLAGS +=
|
||||
|
@ -1,5 +1,5 @@
|
||||
ARCH = arm
|
||||
include $(SRC_PATH)build/platform-msvc-common.mk
|
||||
include $(SRC_PATH)build/msvc-common.mk
|
||||
CFLAGS_OPT += -MD
|
||||
CFLAGS_DEBUG += -MDd
|
||||
CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
|
||||
|
@ -1,4 +1,4 @@
|
||||
include $(SRC_PATH)build/platform-msvc-common.mk
|
||||
include $(SRC_PATH)build/msvc-common.mk
|
||||
LDFLAGS += user32.lib
|
||||
CFLAGS_OPT += -MT
|
||||
CFLAGS_DEBUG += -MTd -Gm
|
||||
|
Loading…
Reference in New Issue
Block a user