Changeset 21812 for branches/gcc-kmk

Timestamp:

Nov 15, 2011, 7:40:01 PM (14 years ago)

Author:

dmik

Message:

Config.kmk: Add support for custom C++ exports to odin_implib macro.

Location:

branches/gcc-kmk

Files:

• Config.kmk (modified) (6 diffs)
• src/gdi32/Makefile.kmk (modified) (1 diff)
• src/kernel32/Makefile.kmk (modified) (1 diff)
• src/odincrt/Makefile.kmk (modified) (1 diff)
• src/user32/Makefile.kmk (modified) (1 diff)

branches/gcc-kmk/Config.kmk

@@ -28 +28 @@
 # @param 2 .def file (defaults to <1>.def).
 # @param 3 .def file for debug (defaults to <2>).
-# @param 4 non-empty to disable .def post-processing with ImpDef.
-#
-odin_implib = $(evalcall odin_implib_common,$(1),$(2),$(3),$(4))
+# @param 4 list of object files containing additional exports.
+# @param 5 non-empty to disable .def post-processing with ImpDef.
+#
+odin_implib = $(evalcall odin_implib_common,$(1),$(2),$(3),$(4),$(5))
 
 define odin_implib_common
@@ -40 +41 @@
         local def_exp_debug := $(notdir $(basename $(def_debug))).exp.def
 endif
-    local no_def_exp := $(4)
+    local obj_list := $(4)
+    local do_def_exp := $(if $(5),,1)
     $(eval $(def_odin_implib))
 endef
@@ -48 +50 @@
     $(target)_imp_TEMPLATE = OdinCxx
     $(target)_imp_NAME     = $(target)
-    $$$$($(target)_imp_0_OUTDIR)/$(def_exp): $(def) $$(PATH_STAGE_BIN)/impdef.exe | $$$$(dir $$$$@)
+    $$$$($(target)_imp_0_OUTDIR)/$(def_exp): $(def) \
+      $(addsuffix $$$$(TOOL_GXX3OMF_COBJSUFF), \
+                  $(addprefix $$$$($(target)_0_OUTDIR)/,$(obj_list))) \
+      $$(PATH_STAGE_BIN)/impdef.exe | $$$$(dir $$$$@)
                 %$$(call MSG_TOOL,impdef,$(target)_imp,$(abspath $$<),$$@)
-                $(QUIET2)$$(PATH_STAGE_BIN)/impdef.exe $$< $$@
+ifneq ($(do_def_exp),)
+                $(QUIET2)$$(PATH_STAGE_BIN)/impdef.exe $(def) $$@
+else
+                $(QUIET2)$(CP) $(def) $$@
+endif
+ifneq ($(obj_list),)
+                $(QUIET2)emxexp.exe \
+                    $(addsuffix $$(TOOL_GXX3OMF_COBJSUFF), \
+                                $(addprefix $$($(target)_0_OUTDIR)/,$(obj_list))) >> $$@
+endif
 ifeq ($(def_exp_debug),)
- ifeq ($(no_def_exp),)
+ ifneq ($(do_def_exp)$(obj_list),)
     $(target)_imp_SOURCES  = $$($(target)_imp_0_OUTDIR)/$(def_exp)
     $(target)_imp_CLEAN   += $$($(target)_imp_0_OUTDIR)/$(def_exp)
@@ -59 +73 @@
  endif
 else
- ifeq ($(no_def_exp),)
+ ifneq ($(do_def_exp)$(obj_list),)
     $(target)_imp_SOURCES.release  = $$($(target)_imp_0_OUTDIR)/$(def_exp)
     $(target)_imp_CLEAN.release   += $$($(target)_imp_0_OUTDIR)/$(def_exp)
-    $$$$($(target)_imp_0_OUTDIR)/$(def_exp_debug): $(def_debug) | $$$$(dir $$$$@)
+    $$$$($(target)_imp_0_OUTDIR)/$(def_exp_debug): $(def_debug) \
+        $(addsuffix $$$$(TOOL_GXX3OMF_COBJSUFF), \
+                    $(addprefix $$$$($(target)_0_OUTDIR)/,$(obj_list))) \
+        $$(PATH_STAGE_BIN)/impdef.exe | $$$$(dir $$$$@)
                 %$$(call MSG_TOOL,impdef,$(target)_imp,$(abspath $$<),$$@)
-                $(QUIET2)$$(PATH_STAGE_BIN)/impdef $$< $$@
+ifneq ($(do_def_exp),)
+                $(QUIET2)$$(PATH_STAGE_BIN)/impdef.exe $(def_debug) $$@
+else
+                $(QUIET2)$(CP) $(def_debug) $$@
+endif
+ifneq ($(obj_list),)
+                $(QUIET2)emxexp.exe \
+                    $(addsuffix $$(TOOL_GXX3OMF_COBJSUFF), \
+                                $(addprefix $$($(target)_0_OUTDIR)/,$(obj_list))) >> $$@
+endif
     $(target)_imp_SOURCES.debug    = $$($(target)_imp_0_OUTDIR)/$(def_exp_debug)
     $(target)_imp_CLEAN.debug     += $$($(target)_imp_0_OUTDIR)/$(def_exp_debug)
@@ -75 +101 @@
 
 ##
-# Shortcut to $(call odin_implib,<1>,<2>,<3>,1) used to disable .def file
+# Shortcut to $(call odin_implib,<1>,<2>,<3>,<4>,1) used to disable .def file
 # post-processing with the ImpDef tool.
 #
@@ -81 +107 @@
 # @param 2 .def file (defaults to <1>.def).
 # @param 3 .def file for debug (defaults to <2>).
-#
-odin_implib_no_expdef = $(call odin_implib,$(1),$(2),(3),1)
-
-##
-# Shortcut to $(call odin_implib, <1>, <1>.def, <1>dbg.def).
-#
-# @param 1 DLL target name.
-#
-odin_implib_2 = $(call odin_implib,$(1),$(1).def,$(1)dbg.def)
-
-##
-# Shortcut to $(call odin_implib_no_expdef,<1>,<1>.def,<1>dbg.def).
-#
-# @param 1 DLL target name.
-#
-odin_implib_2_no_expdef = $(call odin_implib_no_expdef,$(1),$(1).def,$(1)dbg.def)
+# @param 4 list of object files containing additional exports.
+#
+odin_implib_no_expdef = $(call odin_implib,$(1),$(2),(3),$(4),1)
+
+##
+# Shortcut to $(call odin_implib, <1>,<1>.def,<1>dbg.def,<2>).
+#
+# @param 1 DLL target name.
+# @param 2 list of object files containing additional exports.
+#
+odin_implib_2 = $(call odin_implib,$(1),$(1).def,$(1)dbg.def,$(2))
+
+##
+# Shortcut to $(call odin_implib_no_expdef,<1>,<1>.def,<1>dbg.def,<2>).
+#
+# @param 1 DLL target name.
+# @param 2 list of object files containing additional exports.
+#
+odin_implib_2_no_expdef = $(call odin_implib_no_expdef,$(1),$(1).def,$(1)dbg.def,$(2))
 
 #

branches/gcc-kmk/src/gdi32/Makefile.kmk

@@ -6 +6 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-$(call odin_implib,gdi32)
+$(call odin_implib_2,gdi32)
 
 DLLS               += gdi32

branches/gcc-kmk/src/kernel32/Makefile.kmk

@@ -10 +10 @@
 seh_SOURCES         = seh/sehutil.s
 
-$(call odin_implib_2,kernel32)
+$(call odin_implib_2,kernel32,vmutex)
 
 DLLS               += kernel32

branches/gcc-kmk/src/odincrt/Makefile.kmk

@@ -6 +6 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-#$(call odin_implib_no_expdef,odincrt,odincrt,odincrtd)
-$(call odin_implib,odincrt,odincrt.def,odincrtd.def,1)
+$(call odin_implib_no_expdef,odincrt,odincrt.def,odincrtd.def)
 
 DLLS               += odincrt

branches/gcc-kmk/src/user32/Makefile.kmk

@@ -6 +6 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-$(call odin_implib,user32)
+$(call odin_implib_2,user32)
 
 DLLS               += user32