From 03968cbfb0eca0a2a37b3d875b5d7e3bd1d02b81 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 22 Jul 2012 04:16:31 +0100 Subject: get sdk to build with mingw toolchain --- sdk/Makefile | 7 ++++++- sdk/recipes/patches/openssl/Configure.p | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'sdk') diff --git a/sdk/Makefile b/sdk/Makefile index aec5284..9551038 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -31,6 +31,7 @@ path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH) cc__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) cxx__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++) ar__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar) +ranlib__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ranlib) # Flags cflags__ := -I$(GCCSDK_INSTALL_ENV)/include @@ -42,7 +43,7 @@ pkg_config_libdir__ := $(GCCSDK_INSTALL_ENV)/lib/pkgconfig TARGET := $(shell $(cc__) -dumpmachine) # Environment -env := PATH="$(path__)" CC="$(cc__)" CXX="$(cxx__)" AR="$(ar__)" CFLAGS="$(cflags__)" CPPFLAGS="$(cppflags__)" LDFLAGS="$(ldflags__)" PKG_CONFIG_LIBDIR="$(pkg_config_libdir__)" +env := PATH="$(path__)" CC="$(cc__)" CXX="$(cxx__)" AR="$(ar__)" RANLIB="$(ranlib__)" CFLAGS="$(cflags__)" CPPFLAGS="$(cppflags__)" LDFLAGS="$(ldflags__)" PKG_CONFIG_LIBDIR="$(pkg_config_libdir__)" RECIPES := $(CURDIR)/recipes SOURCEDIR := $(CURDIR)/sources @@ -73,6 +74,10 @@ ifeq ($(TARGET),ppc-amigaos) SDK_ITEMS := $(BUILDSTEPS)/libtre.d $(COMMON_SDK_ITEMS) endif +ifeq ($(TARGET),i686-w64-mingw32) + SDK_ITEMS := $(COMMON_SDK_ITEMS) +endif + ifeq ($(SDK_ITEMS),) $(error Unable to compute SDK components for target $(TARGET)) endif diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index 314059f..4552c5f 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -1,6 +1,6 @@ --- Configure.old 2010-12-29 02:43:14.000000000 +0000 +++ Configure 2010-12-29 02:45:29.000000000 +0000 -@@ -412,6 +412,11 @@ +@@ -412,6 +412,12 @@ "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", @@ -8,6 +8,7 @@ +"m68k-atari-mint","m68k-atari-mint-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m68k-atari-mint-ranlib", +"m68k-unknown-amigaos","m68k-unknown-amigaos-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m68k-unknown-amigaos-ranlib", +"ppc-amigaos","ppc-amigaos-gcc:-DB_ENDIAN -DOPENSSL_SYS_AMIGAOS4 -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::ppc-amigaos-ranlib", ++"i686-w64-mingw32", "gcc:-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a", + #### SCO/Caldera targets. # -- cgit v1.2.3