1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-25 20:02:37 +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:
cameronrich 2007-05-25 06:09:44 +00:00
parent a3ed2cd3e0
commit aa4d1bdc09
5 changed files with 151 additions and 155 deletions

View File

@ -1,11 +0,0 @@
deps_config := \
ssl/BigIntConfig.in \
samples/Config.in \
bindings/Config.in \
httpd/Config.in \
ssl/Config.in \
config/Config.in
.config include/config.h: $(deps_config)
$(deps_config):

View File

@ -42,6 +42,7 @@ CONFIG_SSL_MAX_CERTS=2
# CONFIG_SSL_CTX_MUTEXING is not set # CONFIG_SSL_CTX_MUTEXING is not set
CONFIG_USE_DEV_URANDOM=y CONFIG_USE_DEV_URANDOM=y
# CONFIG_WIN32_USE_CRYPTO_LIB is not set # CONFIG_WIN32_USE_CRYPTO_LIB is not set
CONFIG_OPENSSL_COMPATIBLE=y
# CONFIG_PERFORMANCE_TESTING is not set # CONFIG_PERFORMANCE_TESTING is not set
# CONFIG_SSL_TEST is not set # CONFIG_SSL_TEST is not set
CONFIG_AXHTTPD=y CONFIG_AXHTTPD=y
@ -50,18 +51,25 @@ CONFIG_AXHTTPD=y
# Axhttpd Configuration # Axhttpd Configuration
# #
# CONFIG_HTTP_STATIC_BUILD is not set # CONFIG_HTTP_STATIC_BUILD is not set
CONFIG_HTTP_PORT=80
CONFIG_HTTP_HTTPS_PORT=443 CONFIG_HTTP_HTTPS_PORT=443
CONFIG_HTTP_SESSION_CACHE_SIZE=5 CONFIG_HTTP_SESSION_CACHE_SIZE=5
CONFIG_HTTP_WEBROOT="../www" CONFIG_HTTP_WEBROOT="../www"
CONFIG_HTTP_PORT=80
CONFIG_HTTP_TIMEOUT=300 CONFIG_HTTP_TIMEOUT=300
# CONFIG_HTTP_HAS_CGI is not set
CONFIG_HTTP_CGI_EXTENSIONS="" #
# CONFIG_HTTP_DIRECTORIES is not set # CGI
#
CONFIG_HTTP_HAS_CGI=y
CONFIG_HTTP_CGI_EXTENSIONS=".lua,.lp"
CONFIG_HTTP_ENABLE_LUA=y
CONFIG_HTTP_LUA_PREFIX="/usr/local"
# CONFIG_HTTP_BUILD_LUA is not set
CONFIG_HTTP_DIRECTORIES=y
CONFIG_HTTP_HAS_AUTHORIZATION=y
# CONFIG_HTTP_USE_CHROOT is not set # CONFIG_HTTP_USE_CHROOT is not set
# CONFIG_HTTP_CHANGE_UID is not set # CONFIG_HTTP_CHANGE_UID is not set
# CONFIG_HTTP_HAS_IPV6 is not set # CONFIG_HTTP_HAS_IPV6 is not set
CONFIG_HTTP_ALL_MIME_TYPES=y
# CONFIG_HTTP_VERBOSE is not set # CONFIG_HTTP_VERBOSE is not set
# CONFIG_HTTP_IS_DAEMON is not set # CONFIG_HTTP_IS_DAEMON is not set
@ -77,6 +85,8 @@ CONFIG_JAVA_HOME=""
# CONFIG_PERL_BINDINGS is not set # CONFIG_PERL_BINDINGS is not set
CONFIG_PERL_CORE="" CONFIG_PERL_CORE=""
CONFIG_PERL_LIB="" CONFIG_PERL_LIB=""
# CONFIG_LUA_BINDINGS is not set
CONFIG_LUA_CORE=""
# #
# Samples # Samples
@ -87,6 +97,7 @@ CONFIG_C_SAMPLES=y
# CONFIG_VBNET_SAMPLES is not set # CONFIG_VBNET_SAMPLES is not set
# CONFIG_JAVA_SAMPLES is not set # CONFIG_JAVA_SAMPLES is not set
# CONFIG_PERL_SAMPLES is not set # CONFIG_PERL_SAMPLES is not set
# CONFIG_LUA_SAMPLES is not set
# #
# BigInt Options # BigInt Options

View File

@ -32,24 +32,21 @@ all:
ifdef CONFIG_PLATFORM_WIN32 ifdef CONFIG_PLATFORM_WIN32
ifdef CONFIG_VISUAL_STUDIO_6_0 ifdef CONFIG_VISUAL_STUDIO_6_0
CONFIG_VISUAL_STUDIO_6_0_BASE:=$(shell cygpath -w $(CONFIG_VISUAL_STUDIO_6_0_BASE))
CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_6_0_BASE)) CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_6_0_BASE))
export INCLUDE=$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Include INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Include")
export LIB=$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Lib LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_6_0_BASE)\vc98\Lib")
PATH:=$(CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX)/common/msdev98/bin:$(CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX)/vc98/bin:$(PATH) PATH:=$(CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX)/common/msdev98/bin:$(CONFIG_VISUAL_STUDIO_6_0_BASE_UNIX)/vc98/bin:$(PATH)
else else
ifdef CONFIG_VISUAL_STUDIO_7_0 ifdef CONFIG_VISUAL_STUDIO_7_0
CONFIG_VISUAL_STUDIO_7_0_BASE:=$(shell cygpath -w $(CONFIG_VISUAL_STUDIO_7_0_BASE))
CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_7_0_BASE)) CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_7_0_BASE))
export INCLUDE=$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\include;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\platformsdk\include INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\include;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\platformsdk\include")
export LIB=$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\lib LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_7_0_BASE)\vc7\lib")
PATH:=$(CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX)/vc7/bin:$(CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX)/common7/ide:$(PATH) PATH:=$(CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX)/vc7/bin:$(CONFIG_VISUAL_STUDIO_7_0_BASE_UNIX)/common7/ide:$(PATH)
else else
ifdef CONFIG_VISUAL_STUDIO_8_0 ifdef CONFIG_VISUAL_STUDIO_8_0
CONFIG_VISUAL_STUDIO_8_0_BASE:=$(shell cygpath -w $(CONFIG_VISUAL_STUDIO_8_0_BASE))
CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_8_0_BASE)) CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX:=$(shell cygpath -u $(CONFIG_VISUAL_STUDIO_8_0_BASE))
export INCLUDE=$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\include;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\include INCLUDE=$(shell echo "$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\include;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\include")
export LIB=$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\lib LIB=$(shell echo "$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\platformsdk\lib;$(CONFIG_VISUAL_STUDIO_8_0_BASE)\vc\lib")
PATH:=$(CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX)/vc/bin:$(CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX)/common7/ide:$(PATH) PATH:=$(CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX)/vc/bin:$(CONFIG_VISUAL_STUDIO_8_0_BASE_UNIX)/common7/ide:$(PATH)
endif endif
endif endif
@ -58,7 +55,6 @@ endif
CC=cl.exe CC=cl.exe
LD=link.exe LD=link.exe
CFLAGS+=/nologo /W3 /D "WIN32" /D "_MBCS" /D "_CONSOLE" /FD /I"..\ssl" /I"..\config" /c CFLAGS+=/nologo /W3 /D "WIN32" /D "_MBCS" /D "_CONSOLE" /FD /I"..\ssl" /I"..\config" /c
#CFLAGS+=/nologo /W3 /D "WIN32" /D "_MBCS" /D "_CONSOLE" /FD /I"..\ssl" /I"..\config" /D "_CRT_SECURE_NO_DEPRECATE" /c
LDFLAGS=/nologo /subsystem:console /machine:I386 LDFLAGS=/nologo /subsystem:console /machine:I386
LDSHARED = /dll LDSHARED = /dll
AR=lib /nologo AR=lib /nologo

View File

@ -18,26 +18,16 @@
ifneq ($(MAKECMDGOALS), clean) 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 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"
CFLAGS += -I"$(CONFIG_JAVA_HOME)/include/win32" CFLAGS += -I"$(CONFIG_JAVA_HOME)/include/win32"
JAVA_BIN:=$(CONFIG_JAVA_HOME)/bin JAVA_BIN:=$(CONFIG_JAVA_HOME)/bin
else else
ifdef CONFIG_PLATFORM_WIN32 ifdef CONFIG_PLATFORM_WIN32
CONFIG_JAVA_HOME:=$(shell cygpath -w $(CONFIG_JAVA_HOME)) CFLAGS += /I"$(shell cygpath -w $(CONFIG_JAVA_HOME)/include)"
CFLAGS += /I"$(CONFIG_JAVA_HOME)\include" CFLAGS += /I"$(shell cygpath -w $(CONFIG_JAVA_HOME)/include/win32)"
CFLAGS += /I"$(CONFIG_JAVA_HOME)\include\win32" JAVA_BIN:=$(shell cygpath -u $(CONFIG_JAVA_HOME)/bin)
JAVA_BIN:=$(shell cygpath -u $(CONFIG_JAVA_HOME)\bin)
else # Linux else # Linux
CFLAGS += -I$(CONFIG_JAVA_HOME)/include CFLAGS += -I$(CONFIG_JAVA_HOME)/include

View File

@ -1,116 +1,126 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# #
HAVE_DOT_CONFIG=y HAVE_DOT_CONFIG=y
# CONFIG_PLATFORM_LINUX is not set # CONFIG_PLATFORM_LINUX is not set
# CONFIG_PLATFORM_CYGWIN is not set # CONFIG_PLATFORM_CYGWIN is not set
# CONFIG_PLATFORM_SOLARIS is not set # CONFIG_PLATFORM_SOLARIS is not set
CONFIG_PLATFORM_WIN32=y CONFIG_PLATFORM_WIN32=y
# #
# General Configuration # General Configuration
# #
PREFIX="" PREFIX=""
# CONFIG_DEBUG is not set # CONFIG_DEBUG is not set
# #
# Microsoft Compiler Options # Microsoft Compiler Options
# #
# CONFIG_VISUAL_STUDIO_6_0 is not set # CONFIG_VISUAL_STUDIO_6_0 is not set
CONFIG_VISUAL_STUDIO_7_0=y CONFIG_VISUAL_STUDIO_7_0=y
# CONFIG_VISUAL_STUDIO_8_0 is not set # CONFIG_VISUAL_STUDIO_8_0 is not set
CONFIG_VISUAL_STUDIO_6_0_BASE="" CONFIG_VISUAL_STUDIO_6_0_BASE=""
CONFIG_VISUAL_STUDIO_7_0_BASE="c:\\Program Files\\Microsoft Visual Studio .NET 2003" CONFIG_VISUAL_STUDIO_7_0_BASE="c:\\Program Files\\Microsoft Visual Studio .NET 2003"
CONFIG_VISUAL_STUDIO_8_0_BASE="" CONFIG_VISUAL_STUDIO_8_0_BASE=""
CONFIG_EXTRA_CFLAGS_OPTIONS="" CONFIG_EXTRA_CFLAGS_OPTIONS=""
CONFIG_EXTRA_LDFLAGS_OPTIONS="" CONFIG_EXTRA_LDFLAGS_OPTIONS=""
# #
# SSL Library # SSL Library
# #
# CONFIG_SSL_SERVER_ONLY is not set # CONFIG_SSL_SERVER_ONLY is not set
# CONFIG_SSL_CERT_VERIFICATION is not set # CONFIG_SSL_CERT_VERIFICATION is not set
# CONFIG_SSL_ENABLE_CLIENT is not set # CONFIG_SSL_ENABLE_CLIENT is not set
CONFIG_SSL_FULL_MODE=y CONFIG_SSL_FULL_MODE=y
# CONFIG_SSL_SKELETON_MODE is not set # CONFIG_SSL_SKELETON_MODE is not set
# CONFIG_SSL_PROT_LOW is not set # CONFIG_SSL_PROT_LOW is not set
CONFIG_SSL_PROT_MEDIUM=y CONFIG_SSL_PROT_MEDIUM=y
# CONFIG_SSL_PROT_HIGH is not set # CONFIG_SSL_PROT_HIGH is not set
CONFIG_SSL_USE_DEFAULT_KEY=y CONFIG_SSL_USE_DEFAULT_KEY=y
CONFIG_SSL_ENABLE_V23_HANDSHAKE=y CONFIG_SSL_ENABLE_V23_HANDSHAKE=y
CONFIG_SSL_HAS_PEM=y CONFIG_SSL_HAS_PEM=y
CONFIG_SSL_USE_PKCS12=y CONFIG_SSL_USE_PKCS12=y
CONFIG_SSL_EXPIRY_TIME=24 CONFIG_SSL_EXPIRY_TIME=24
CONFIG_X509_MAX_CA_CERTS=4 CONFIG_X509_MAX_CA_CERTS=4
CONFIG_SSL_MAX_CERTS=2 CONFIG_SSL_MAX_CERTS=2
# CONFIG_SSL_CTX_MUTEXING is not set # CONFIG_SSL_CTX_MUTEXING is not set
# CONFIG_USE_DEV_URANDOM is not set # CONFIG_USE_DEV_URANDOM is not set
CONFIG_WIN32_USE_CRYPTO_LIB=y CONFIG_WIN32_USE_CRYPTO_LIB=y
# CONFIG_PERFORMANCE_TESTING is not set # CONFIG_OPENSSL_COMPATIBLE is not set
# CONFIG_SSL_TEST is not set # CONFIG_PERFORMANCE_TESTING is not set
CONFIG_AXHTTPD=y # CONFIG_SSL_TEST is not set
CONFIG_AXHTTPD=y
#
# Axhttpd Configuration #
# # Axhttpd Configuration
# CONFIG_HTTP_STATIC_BUILD is not set #
CONFIG_HTTP_PORT=80 # CONFIG_HTTP_STATIC_BUILD is not set
CONFIG_HTTP_HTTPS_PORT=443 CONFIG_HTTP_PORT=80
CONFIG_HTTP_SESSION_CACHE_SIZE=5 CONFIG_HTTP_HTTPS_PORT=443
CONFIG_HTTP_WEBROOT="www" CONFIG_HTTP_SESSION_CACHE_SIZE=5
CONFIG_HTTP_TIMEOUT=300 CONFIG_HTTP_WEBROOT="../www"
# CONFIG_HTTP_HAS_CGI is not set CONFIG_HTTP_TIMEOUT=300
CONFIG_HTTP_CGI_EXTENSIONS=""
CONFIG_HTTP_DIRECTORIES=y #
# CONFIG_HTTP_USE_CHROOT is not set # CGI
# CONFIG_HTTP_CHANGE_UID is not set #
CONFIG_HTTP_HAS_AUTHORIZATION=y # CONFIG_HTTP_HAS_CGI is not set
# CONFIG_HTTP_HAS_IPV6 is not set CONFIG_HTTP_CGI_EXTENSIONS=""
CONFIG_HTTP_ALL_MIME_TYPES=y # CONFIG_HTTP_ENABLE_LUA is not set
CONFIG_HTTP_VERBOSE=y CONFIG_HTTP_LUA_PREFIX=""
# CONFIG_HTTP_IS_DAEMON is not set # CONFIG_HTTP_BUILD_LUA is not set
CONFIG_HTTP_DIRECTORIES=y
# CONFIG_HTTP_HAS_AUTHORIZATION=y
# Language Bindings # CONFIG_HTTP_USE_CHROOT is not set
# # CONFIG_HTTP_CHANGE_UID is not set
CONFIG_BINDINGS=y # CONFIG_HTTP_HAS_IPV6 is not set
CONFIG_CSHARP_BINDINGS=y # CONFIG_HTTP_VERBOSE is not set
CONFIG_VBNET_BINDINGS=y # CONFIG_HTTP_IS_DAEMON is not set
# #
# .Net Framework # Language Bindings
# #
CONFIG_DOT_NET_FRAMEWORK_BASE="c:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727" CONFIG_BINDINGS=y
CONFIG_JAVA_BINDINGS=y CONFIG_CSHARP_BINDINGS=y
CONFIG_VBNET_BINDINGS=y
#
# Java Home #
# # .Net Framework
CONFIG_JAVA_HOME="c:\\Program Files\\Java\\jdk1.5.0_06" #
# CONFIG_PERL_BINDINGS is not set CONFIG_DOT_NET_FRAMEWORK_BASE="c:\\WINDOWS\\Microsoft.NET\\Framework\\v2.0.50727"
CONFIG_PERL_CORE="" CONFIG_JAVA_BINDINGS=y
CONFIG_PERL_LIB=""
#
# # Java Home
# Samples #
# CONFIG_JAVA_HOME="c:\\Program Files\\Java\\jdk1.5.0_06"
CONFIG_SAMPLES=y # CONFIG_PERL_BINDINGS is not set
CONFIG_C_SAMPLES=y CONFIG_PERL_CORE=""
CONFIG_CSHARP_SAMPLES=y CONFIG_PERL_LIB=""
CONFIG_VBNET_SAMPLES=y # CONFIG_LUA_BINDINGS is not set
CONFIG_JAVA_SAMPLES=y CONFIG_LUA_CORE=""
# CONFIG_PERL_SAMPLES is not set
#
# # Samples
# BigInt Options #
# CONFIG_SAMPLES=y
# CONFIG_BIGINT_CLASSICAL is not set CONFIG_C_SAMPLES=y
# CONFIG_BIGINT_MONTGOMERY is not set CONFIG_CSHARP_SAMPLES=y
CONFIG_BIGINT_BARRETT=y CONFIG_VBNET_SAMPLES=y
CONFIG_BIGINT_CRT=y CONFIG_JAVA_SAMPLES=y
# CONFIG_BIGINT_KARATSUBA is not set # CONFIG_PERL_SAMPLES is not set
MUL_KARATSUBA_THRESH=0 # CONFIG_LUA_SAMPLES is not set
SQU_KARATSUBA_THRESH=0
CONFIG_BIGINT_SLIDING_WINDOW=y #
CONFIG_BIGINT_SQUARE=y # BigInt Options
# CONFIG_BIGINT_CHECK_ON is not set #
# CONFIG_BIGINT_CLASSICAL is not set
# CONFIG_BIGINT_MONTGOMERY is not set
CONFIG_BIGINT_BARRETT=y
CONFIG_BIGINT_CRT=y
# CONFIG_BIGINT_KARATSUBA is not set
MUL_KARATSUBA_THRESH=0
SQU_KARATSUBA_THRESH=0
CONFIG_BIGINT_SLIDING_WINDOW=y
CONFIG_BIGINT_SQUARE=y
# CONFIG_BIGINT_CHECK_ON is not set