Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -24,20 +24,33 @@ PREFIX ?= c:/chicken-iup NATIVE_PREFIX = $(subst /,\\\\,$(PREFIX)) # Used for InnoSetup script CHICKEN_URL = http://code.call-cc.org/releases ifndef CHICKEN_VERSION - CHICKEN_VERSION = 4.9.0 - CHICKEN_PATCHLEVEL = .1 + CHICKEN_VERSION = 4.12.0 + CHICKEN_PATCHLEVEL = endif CHICKEN_PKGNAME = chicken-$(CHICKEN_VERSION)$(CHICKEN_PATCHLEVEL) CHICKEN_DIR = $(CHICKEN_PKGNAME) CHICKEN_PKG = $(CHICKEN_PKGNAME).tar.gz CHICKEN_PLATFORM ?= mingw-msys CHICKEN_PREFIX ?= $(PREFIX) -EGGS = apropos trace regex-case regex-literals format big-chicken pdf sql-de-lite coops tinyclos test regex slime canvas-draw utf8 +EGGS = apropos trace regex-case regex-literals format big-chicken pdf sql-de-lite \ +coops tinyclos test regex slime utf8 matchable apropos base64 regex-literals format "regex-case" "test" \ + coops trace csv dot-locking posix-utils posix-extras directory-utils \ + tcp rpc csv-xml fmt json awful spiffy uri-common intarweb \ + spiffy-request-vars s spiffy-directory-listing ssax sxml-serializer \ + sxml-modifications logpro z3 call-with-environment-variables \ + pathname-expand typed-records simple-exceptions numbers srfi-42 \ + alist-lib ansi-escape-sequences args basic-sequences bindings chicken-doc \ + cock condition-utils define-record-and-printer \ + expand-full filepath foof-loop ini-file irc lalr lazy-seq \ + loops low-level-macros procedural-macros rfc3339 scsh-process \ + sexp-diff shell slice srfi-101 \ + srfi-29 srfi-37 srfi-78 + define GET_FFCALL_CVS cvs -z3 -d:pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall co ffcall endef @@ -62,19 +75,19 @@ IUP_URL = http://sourceforge.net/projects IUP_PLATFORM ?= Win32_dllw4 IUP_LIBDIR ?= $(PREFIX)/lib IM_LONGNAME = imtoolkit -IM_VERSION ?= 3.9 +IM_VERSION ?= 3.12 IM_PKG = im-$(IM_VERSION)_$(IUP_PLATFORM)_lib.zip CD_LONGNAME = canvasdraw -CD_VERSION ?= 5.8.1 +CD_VERSION ?= 5.9 CD_PKG = cd-$(CD_VERSION)_$(IUP_PLATFORM)_lib.zip IUP_LONGNAME = iup -IUP_VERSION ?= 3.13 +IUP_VERSION ?= 3.22 IUP_PKG = iup-$(IUP_VERSION)_$(IUP_PLATFORM)_lib.zip SRC_PKGS = $(CHICKEN_PKG) $(FFCALL_PKG) BIN_PKGS = $(IM_PKG) $(CD_PKG) $(IUP_PKG) SRC_DIRS = $(CHICKEN_DIR) $(FFCALL_DIR) @@ -145,18 +158,14 @@ fi \ fi srcpkgs.compile : chicken.compile ffcall.compile -chicken.compile : $(CHICKEN_DIR) $(CHICKEN_DIR)/chicken.h.orig +chicken.compile : $(CHICKEN_DIR) cd $(CHICKEN_DIR) && \ $(MAKE) PLATFORM=$(CHICKEN_PLATFORM) PREFIX=$(CHICKEN_PREFIX) -$(CHICKEN_DIR)/chicken.h.orig : $(CHICKEN_DIR) - cd $(CHICKEN_DIR) && \ - patch -p0 <../0001-Disable-getc_unlocked.patch - ffcall.compile : $(FFCALL_DIR) cd $(FFCALL_DIR) && \ ./configure --prefix=$(FFCALL_PREFIX) && \ $(MAKE) @@ -172,12 +181,14 @@ $(MAKE) install install : base.install eggs eggs : - chicken-install -D disable-iup-web iup - $(foreach egg,$(EGGS),chicken-install -keep-installed $(egg);) + CSC_OPTIONS="-I$(PREFIX)/include/ -I$(PREFIX)/lib/include -L$(PREFIX)/lib" $(PREFIX)/bin/chicken-install -D disable-iup-web -D disable-iup-pplot iup:1.7.0 + CSC_OPTIONS="-I$(PREFIX)/include/ -I$(PREFIX)/lib/include -L$(PREFIX)/lib" $(PREFIX)/bin/chicken-install -D disable-canvas-draw-native canvas-draw +# #$(foreach egg,$(EGGS),CSC_OPTIONS="-I$(PREFIX)/include/ -I$(PREFIX)/lib/include -L$(PREFIX)/lib" $(PREFIX)/bin/chicken-install -keep-installed $(egg);) + CSC_OPTIONS="-I$(PREFIX)/include/ -I$(PREFIX)/lib/include -L$(PREFIX)/lib" $(PREFIX)/bin/chicken-install -keep-installed $(EGGS) # CAREFUL: this rule removes the entire $PREFIX directory tree! binpkg.prep : chicken-iup.iss strip-lua mkdir -p binpkg && \ mv $(PREFIX)/* binpkg && rmdir $(PREFIX) Index: Output/chicken-iup-setup.exe ================================================================== --- Output/chicken-iup-setup.exe +++ Output/chicken-iup-setup.exe cannot compute difference between binary files Index: wget.exe ================================================================== --- wget.exe +++ wget.exe cannot compute difference between binary files