From 98048aba28ff4251c07ff0328fbe831fc4b1864d Mon Sep 17 00:00:00 2001 From: Juan Jose Garcia Ripoll Date: Wed, 29 Dec 2010 23:39:10 +0100 Subject: [PATCH] ECL now ships a Windows icon which is added to the executable at build time. --- src/CHANGELOG | 2 + src/compile.lsp.in | 15 ++++- src/util/ecl.ico | Bin 0 -> 4286 bytes src/util/ecl.svg | 134 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 src/util/ecl.ico create mode 100644 src/util/ecl.svg diff --git a/src/CHANGELOG b/src/CHANGELOG index a796cf79c..d9ace3412 100755 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -145,6 +145,8 @@ ECL 10.5.1: - --enable-rpath now defaults to YES. + - ECL now ships a Windows icon which is added to the executable at build time. + ;;; Local Variables: *** ;;; mode:text *** ;;; fill-column:79 *** diff --git a/src/compile.lsp.in b/src/compile.lsp.in index 6f98a40ea..52885cd4e 100755 --- a/src/compile.lsp.in +++ b/src/compile.lsp.in @@ -132,6 +132,9 @@ ;;; (mapc #'proclaim +ecl-optimization-settings+) +#+windows +(setq *features* (cons :wants-bytecmp (cons :builtin-bytecmp *features*))) + #-mingw32 (si::pathname-translations "SYS" '(("**;*.*.*" "@ecldir\@/**/*.*"))) @@ -312,12 +315,22 @@ (setq si::*init-function-prefix* NIL) +#+windows +(progn + (with-open-file (s "ecl.rc" + :direction :output + :if-exists :supersede + :if-does-not-exist :create) + (write-line "id ICON \"ecl.ico\"" s)) + (ext:copy-file #p"src:util;ecl.ico" "ecl.ico") + (ext:run-program "windres" '("ecl.rc" "-O" "coff" "ecl.res"))) + (compiler::build-program #+:msvc "ecl2" #+(and (or cross stage1) (not msvc)) "bin/ecl" #-(or cross stage1 msvc) "ecl2" :lisp-files *module-symbols* - :ld-flags '(#-msvc "-L./")) + :ld-flags '(#-msvc "-L./" #+windows "ecl.res")) (with-open-file (modules-list #P"build:MODULES" :direction :output) (dolist (module-file *module-files*) diff --git a/src/util/ecl.ico b/src/util/ecl.ico new file mode 100644 index 0000000000000000000000000000000000000000..090d42ddf444e33e424fc4a2d6ba5d6cfe036859 GIT binary patch literal 4286 zcmZQzU}RuqP*4ET3Jfa*7#PGD7#K7d7#I{77#JKFAmR)-!2kdM8A!pQww|Ivc7Arj zw!Q%&Ha>|V*1qXM);{5()_$&mR^B=d4Gm1Bm`9A-0EYm95Nn_4IP=hjxdw3;OLdcP zRcoa`s?*GTUa6h-phP$MW{zRp`ADn4J;64pPB>*2aXuaprlgW zQU<-G%$GsCpu-=*cp|Ns5{=RYyv=a(PlNf7J)cpPX z_y750Xa28>pAL?%4%LE}u@)iwgKd2ak?lffSLmjicB>ZsoS;_v|NQc!|CN=M|1&T! zfU&u`If@rgFt+oxRo|K^qpVB=SyP-)v`%#Fs-_~Fo zZzYhO$hb`{Z#^i?PfXs0V!VZg1>8&>9i9K6utiY-<(xZr4y=xunfZTRUETlFr%(T% zK7IOsH8r*WF)=a!H)k&dy8)Cpf~Y!F9Vnxx>O2xf&BjD z)IAivFiv1#AlPh>8$fB|*RNkNDKP!--@pGdGBRL$Ky0ue5|Nda1?HV!co-Z8rFzLX zgKd3ELH7466bSSw7yn%qISs4^8*%H_t^cg7tZ+Ag!WCKF#fulga#N>HMHa?jgYxin zle&MMss$f|ZG2aShK4ftD-}nA{C;l1VGQ-i0y#N3U^_rzASEUB|J%23aOvLO-v5k@ zjQ^iJc>)*1#n@T40vra3W?_dxWptlX$zqWGA0EBMr3Ebh>eZ|Ne0+RxH*|M*gT+CF zr>EzCV`F0wlOVpm^D@}}65XVmfi`{~y~@R>rW@D&BdGEJ|Nm`mZE*XAg@ylv@;fLk zaC3A2ud1pd#)$u)Uwj1HU!#@&IKV?uPpM`u~Rx9Rl+~ z>6{ot{{8v;zh9-~f1^hBs}Nh?+&<;v-|G@)6QdQZX5qqxVEaJnfR~r|KPYX3{QvVO z@#XXk)B1m{YIz@mZGBSvRZ8A051s@zn-~IA{ume-z}*0HhnJTZF>AxSJ zzJuk7B|JPl;BL5j^(wL2{y#l?A8dbxPRiXtvq0fK#o}U6{)5#y#2R$@^5y?bOicf! zrKO400#l423ZSk_P>Asm-_Yn1J$z`#!;XO38mfN zr&MyJPr2m(;}dt_W*j_t@PAEB4V({S{P^+Xzoew(e-{@Qm=Hl4R`=CtWn9G84(wGd z((hL;`8LI%`rrEpufgU$d-m)<`2)of5kL5Xu@dy(0_%0=OQ$|c`HZPD$;%l>yXw1Lwa$bL|stF5iY zWhGer<<%$u*T&5Rr}Z9{qED^Lxpv6r6T|LTC^Z15Nu}cd6Ew>Ht<9PHe@*|=|6f0R z2HSy7e0}rz|K*h@|F2J)^B?4HP=4xGF4)QvVNTXP;8>zaHhHy?u&>X4uRlSFA^|SiV=eB(G1g zXhWZ3@wtBGl2?67#ee#gOP=*96`$-^EMC#8T$C_LC0CS0JO2NF!2bV#1H=D+3=H*u z7#Qq-Ffhn}U|`^Xz`($MfPsM-gc}$bm>U=v7(ti;G^Bt7gXE!VLHa=Y*&i@4@PA-n bkpIEJVE>1Kq5dBO!~g#c%>Vy?kpB+=lkx%h literal 0 HcmV?d00001 diff --git a/src/util/ecl.svg b/src/util/ecl.svg new file mode 100644 index 000000000..e49ea8f61 --- /dev/null +++ b/src/util/ecl.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + λ + +