Bug 962848 - Port |Bug 957220 - Enable code to build from m-c's config/rules.mk copies|. r=florian
authorPatrick Cloke <clokep@gmail.com>
Wed, 22 Jan 2014 20:48:24 -0500
changeset 18501 52e6bc2710750c6da29ec18f445f1b64cf1825e8
parent 18500 df0b77fa9170dcecb3a72037ab4b737be7917985
child 18502 62c82ae99b5133b243c116b9a7e6128b0833f567
push idunknown
push userunknown
push dateunknown
reviewersflorian
bugs962848, 957220
Bug 962848 - Port |Bug 957220 - Enable code to build from m-c's config/rules.mk copies|. r=florian
im/app/Makefile.in
im/app/png.py
im/app/png2ico.py
--- a/im/app/Makefile.in
+++ b/im/app/Makefile.in
@@ -99,22 +99,31 @@ ifdef _MSC_VER
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
 
 ifdef NS_TRACE_MALLOC
 EXTRA_DSO_LIBS += tracemalloc
 endif
 
 ifeq ($(OS_ARCH),WINNT)
+# png to ico converter. The function takes 5 arguments, in order: source png
+# file, left, top, size, output ico file.
+png2ico = $(PYTHON) $(srcdir)/png2ico.py $(1) $(2) $(3) $(4) $(5)
+
 # Extract the icons we care about embedding into the EXE
-embedded-icons::
+available-16.ico: $(topsrcdir)/chat/themes/available-16.png $(srcdir)/png2ico.py
 	$(call png2ico,$(topsrcdir)/chat/themes/available-16.png,0,0,16,available-16.ico)
+
+away-16.ico: $(topsrcdir)/chat/themes/away-16.png $(srcdir)/png2ico.py
 	$(call png2ico,$(topsrcdir)/chat/themes/away-16.png,0,0,16,away-16.ico)
+
+offline-16.ico: $(topsrcdir)/chat/themes/offline-16.png $(srcdir)/png2ico.py
 	$(call png2ico,$(topsrcdir)/chat/themes/offline-16.png,0,0,16,offline-16.ico)
 
+embedded-icons:: available-16.ico away-16.ico offline-16.ico
 GARBAGE += available-16.ico away-16.ico offline-16.ico
 
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 RCINCLUDE = splash.rc
copy from mail/app/png.py
copy to im/app/png.py
copy from mail/app/png2ico.py
copy to im/app/png2ico.py