diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-07-16 13:31:42 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-07-16 13:31:42 -0600 |
| commit | 6e9bb9178356620bd47d9f2e31abf42b7f1a8f11 (patch) | |
| tree | 6f04b5500462d1f6e26ebcba58c5e9cd56afd442 /icon/Makefile.am | |
| parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
| parent | 87c8bb3956897830da1f7aaca2990a9571767b73 (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'icon/Makefile.am')
| -rw-r--r-- | icon/Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/icon/Makefile.am b/icon/Makefile.am index c08e9236..af238ac4 100644 --- a/icon/Makefile.am +++ b/icon/Makefile.am @@ -150,14 +150,21 @@ SUFFIXES=.svg .build .icns .ico .rc .o .exe icotool -c -o $@ $(shell for i in $(WIN_RES); do echo $*-$$i.png; done) .ico.rc: - echo '101 ICON "$*.ico"' > $@ + ./make-rc "$*" $(VERSION) > $@ MINGCC32=i686-w64-mingw32-gcc MINGWINDRES=i686-w64-mingw32-windres +MINGFLAGS=-Wall -DWINDOWS -mwindows +MINGLIBS=-lshlwapi .rc.o: $(MINGWINDRES) $*.rc $@ .o.exe: - $(MINGCC32) -o $@ windows-stub.c $*.o + $(MINGCC32) -o $@ $(MINGFLAGS) windows-stub.o $*.o $(MINGLIBS) + +$(EXE_FILES): windows-stub.o make-rc + +windows-stub.o: windows-stub.c + $(MINGCC32) -c $(MINGFLAGS) windows-stub.c |