strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gnumake2: fixing rscdep on windows, delivering manifests for executables on windows

Browse source
This commit is contained in:
Bjoern Michaelsen 2010-07-26 17:26:37 +02:00
parent c4753e0f4a
commit 6e71ef0a97
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
solenv/gbuild/Executable.mk
View file

@ -35,11 +35,13 @@
.PHONY : $(call gb_Executable_get_clean_target,%) .PHONY : $(call gb_Executable_get_clean_target,%)
$(call gb_Executable_get_clean_target,%) : $(call gb_Executable_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Executable_get_target,$*)) rm -f $(call gb_Executable_get_target,$*) \
$(AUXTARGETS))
$(call gb_Executable_get_target,%) : $(call gb_Executable_get_target,%) :
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && cp -pf $< $@) mkdir -p $(dir $@) && cp -pf $< $@ \
$(foreach target,$(AUXTARGETS), && cp -pf $(dir $<)/$(notdir $(target)) $(target)))
define gb_Executable_Executable define gb_Executable_Executable
$(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT)) $(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT))

4
solenv/gbuild/platform/windows.mk
View file

@ -382,6 +382,7 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS += \ gb_Library_PLAINLIBS += \
advapi32 \ advapi32 \
gdi32 \ gdi32 \
gnu_getopt \
kernel32 \ kernel32 \
msvcrt \ msvcrt \
mpr \ mpr \
@ -431,6 +432,7 @@ gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
gb_Library_NOILIBFILENAMES:=\ gb_Library_NOILIBFILENAMES:=\
advapi32 \ advapi32 \
gdi32 \ gdi32 \
gnu_getopt \
icuuc \ icuuc \
kernel32 \ kernel32 \
msvcrt \ msvcrt \
@ -518,6 +520,8 @@ $(call gb_LinkTarget_set_auxtargets,$(2),\
$(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \ $(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \
$(call gb_LinkTarget_get_target,$(2)).manifest \ $(call gb_LinkTarget_get_target,$(2)).manifest \
) )
$(call gb_Executable_get_target,$(1)) \
$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest
endef endef
# SdiTarget class # SdiTarget class