mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
8f339b27dd
- gdk-pixbuf-csource no longer supports bmp files - add a rule in the makefile to convert bmp -> png
24 lines
978 B
Diff
24 lines
978 B
Diff
diff --git a/GNUmakefile b/GNUmakefile
|
|
index f83f04d..25a4fa8 100644
|
|
--- a/GNUmakefile
|
|
+++ b/GNUmakefile
|
|
@@ -798,6 +798,9 @@ libklzw$(DLLSUFFIX): $(engine_src)/klzw.cpp
|
|
$(COMPILE_STATUS)
|
|
$(RECIPE_IF) $(COMPILER_C) -shared -fPIC $< -o $@ $(RECIPE_RESULT_COMPILE)
|
|
|
|
+%.png: %.bmp
|
|
+ gm convert $< $@
|
|
+
|
|
# to debug the tools link phase, make a copy of this rule explicitly replacing % with the name of a tool, such as kextract
|
|
%$(EXESUFFIX): $(tools_obj)/%.$o $(foreach i,tools $(tools_deps),$(call expandobjs,$i))
|
|
$(LINK_STATUS)
|
|
@@ -880,7 +883,7 @@ $$($1_obj)/%.$$o: $$($1_rsrc)/%.c | $$($1_obj)
|
|
$$(call MKDIR,$$(dir $$@))
|
|
$$(RECIPE_IF) $$(COMPILER_C) $$($1_cflags) -c $$< -o $$@ $$(RECIPE_RESULT_COMPILE)
|
|
|
|
-$$($1_obj)/%_banner.c: $$($1_rsrc)/%.bmp | $$($1_obj)
|
|
+$$($1_obj)/%_banner.c: $$($1_rsrc)/%.png | $$($1_obj)
|
|
echo "#include \"gtkpixdata_shim.h\"" > $$@
|
|
gdk-pixbuf-csource --extern --struct --raw --name=startbanner_pixdata $$^ | sed 's/load_inc//' >> $$@
|
|
|