diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Executable_mkunroll.mk | 3 | ||||
| -rw-r--r-- | tools/Executable_rscdep.mk | 6 | ||||
| -rw-r--r-- | tools/Executable_so_checksum.mk | 3 | ||||
| -rw-r--r-- | tools/Library_tl.mk | 17 | ||||
| -rw-r--r-- | tools/Package_reversemap.mk | 2 | ||||
| -rw-r--r-- | tools/StaticLibrary_toolshelpers.mk | 3 |
6 files changed, 8 insertions, 26 deletions
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index 6936b70283fe..d423b73c755b 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,mkunroll,\ -I$(realpath $(SRCDIR)/tools/bootstrp) \ )) -$(eval $(call gb_Executable_set_cxxflags,mkunroll,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Executable_add_defs,mkunroll,\ -D_TOOLS_STRINGLIST \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 87c4b3776033..a4a7c7d1fb95 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,rscdep,\ -I$(realpath $(SRCDIR)/tools/bootstrp) \ )) -$(eval $(call gb_Executable_set_cxxflags,rscdep,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Executable_add_defs,rscdep,\ -D_TOOLS_STRINGLIST \ )) @@ -55,8 +54,7 @@ $(eval $(call gb_Executable_add_linked_static_libs,rscdep,\ ifeq ($(OS),WNT) ifeq ($(HAVE_GETOPT),YES) -$(eval $(call gb_Executable_set_cxxflags,rscdep,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Executable_add_defs,rscdep,\ -DHAVE_GETOPT \ )) else diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index 7adf7a998de7..17d2e26cdf08 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,so_checksum,\ -I$(realpath $(SRCDIR)/tools/bootstrp) \ )) -$(eval $(call gb_Executable_set_cxxflags,so_checksum,\ - $$(CXXFLAGS) \ +$(eval $(call gb_Executable_add_defs,so_checksum,\ -D_TOOLS_STRINGLIST \ )) diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index ad3c9c4ec682..c86152370c71 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,tl,\ -I$(WORKDIR)/CustomTarget/tools/source/reversemap \ )) -$(eval $(call gb_Library_set_defs,tl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,tl,\ -DTOOLS_DLLIMPLEMENTATION \ -DVCL \ )) @@ -128,19 +127,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ )) endif -ifeq ($(SYSTEM_ZLIB),YES) -$(eval $(call gb_Library_set_cxxflags,tl,\ - $$(CXXFLAGS) \ - -DSYSTEM_ZLIB \ -)) -$(eval $(call gb_Library_add_linked_libs,tl,\ - z \ -)) -else -$(eval $(call gb_Library_add_linked_static_libs,tl,\ - zlib \ -)) -endif +$(eval $(call gb_Library_use_external,tl,zlib)) ifeq ($(OS),WNT) diff --git a/tools/Package_reversemap.mk b/tools/Package_reversemap.mk index ae739de09294..9abc71ba4122 100644 --- a/tools/Package_reversemap.mk +++ b/tools/Package_reversemap.mk @@ -24,7 +24,7 @@ # instead of those above. $(eval $(call gb_Package_Package,tools_reversemap,$(WORKDIR)/CustomTarget/tools/source/reversemap)) -$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap)) +$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap,SRCDIR)) $(eval $(call gb_CustomTarget_add_outdir_dependencies,tools/source/reversemap,\ $(call gb_Executable_get_target_for_build,bestreversemap) \ diff --git a/tools/StaticLibrary_toolshelpers.mk b/tools/StaticLibrary_toolshelpers.mk index 94ba4f739382..5583c8b4a056 100644 --- a/tools/StaticLibrary_toolshelpers.mk +++ b/tools/StaticLibrary_toolshelpers.mk @@ -34,8 +34,7 @@ $(eval $(call gb_StaticLibrary_set_include,toolshelpers,\ -I$(realpath $(SRCDIR)/tools/bootstrp) \ )) -$(eval $(call gb_StaticLibrary_set_cxxflags,toolshelpers,\ - $$(CXXFLAGS) \ +$(eval $(call gb_StaticLibrary_add_cxxflags,toolshelpers,\ -D_TOOLS_STRINGLIST \ )) |