mirror of
https://github.com/esp8266/Arduino.git
synced 2025-09-02 09:41:44 +03:00
updates to make
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@102 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
@@ -18,26 +18,16 @@
|
||||
|
||||
ifneq ($(MAKECMDGOALS), clean)
|
||||
|
||||
all: test_jdk_location
|
||||
|
||||
test_jdk_location:
|
||||
@if ! [ -d "$(CONFIG_JAVA_HOME)" ]; then \
|
||||
echo "*** Error: JDK path of $(CONFIG_JAVA_HOME) doesn't exist" && exit 1; \
|
||||
fi
|
||||
|
||||
|
||||
ifdef CONFIG_PLATFORM_CYGWIN
|
||||
CONFIG_JAVA_HOME:=$(shell cygpath -u $(CONFIG_JAVA_HOME))
|
||||
CFLAGS += -I"$(CONFIG_JAVA_HOME)/include"
|
||||
CFLAGS += -I"$(CONFIG_JAVA_HOME)/include/win32"
|
||||
JAVA_BIN:=$(CONFIG_JAVA_HOME)/bin
|
||||
else
|
||||
|
||||
ifdef CONFIG_PLATFORM_WIN32
|
||||
CONFIG_JAVA_HOME:=$(shell cygpath -w $(CONFIG_JAVA_HOME))
|
||||
CFLAGS += /I"$(CONFIG_JAVA_HOME)\include"
|
||||
CFLAGS += /I"$(CONFIG_JAVA_HOME)\include\win32"
|
||||
JAVA_BIN:=$(shell cygpath -u $(CONFIG_JAVA_HOME)\bin)
|
||||
CFLAGS += /I"$(shell cygpath -w $(CONFIG_JAVA_HOME)/include)"
|
||||
CFLAGS += /I"$(shell cygpath -w $(CONFIG_JAVA_HOME)/include/win32)"
|
||||
JAVA_BIN:=$(shell cygpath -u $(CONFIG_JAVA_HOME)/bin)
|
||||
else # Linux
|
||||
CFLAGS += -I$(CONFIG_JAVA_HOME)/include
|
||||
|
||||
|
Reference in New Issue
Block a user