Changeset 21746 for branches

Timestamp:

Oct 26, 2011, 9:16:43 PM (14 years ago)

Author:

dmik

Message:

Add handler to compile .orc source files with Wine RC.

Location:

branches/gcc-kmk

Files:

• Config.kmk (modified) (1 diff)
• src/kernel32/Makefile.kmk (modified) (2 diffs)

branches/gcc-kmk/Config.kmk

@@ -6 +6 @@
 # Global definitions
 #------------------------------------------------------------------------------
+
+# Handler for Wine RC (.orc) source files
+KBUILD_SRC_HANDLERS += .orc:def_src_handler_wrc
+define def_src_handler_wrc
+local type := WRC
+ $(kb-src-one 2)
+endef
+
+#------------------------------------------------------------------------------
+# Tools
+#------------------------------------------------------------------------------
+
+# Add support for Wine RC to the GCC compiler
+TOOL_GXX3OMF_WRC                = $(PATH_STAGE_BIN)/winerc.exe
+TOOL_GXX3OMF_WRCOBJSUFF         = .o
+TOOL_GXX3OMF_COMPILE_WRC_OUTPUT = $(outbase).orc.s
+TOOL_GXX3OMF_COMPILE_WRC_DEPEND =
+TOOL_GXX3OMF_COMPILE_WRC_DEPORD =
+define TOOL_GXX3OMF_COMPILE_WRC_CMDS
+        $(QUIET)$(TOOL_GXX3OMF_WRC) -s\
+        $(flags) $(addprefix -I, $(subst /,\\,$(incs))) $(addprefix -D, $(defs))\
+        $(subst /,\\,$(abspath $(source))) \
+        -o $(TOOL_GXX3OMF_COMPILE_WRC_OUTPUT)
+        $(subst $(source),$(TOOL_GXX3OMF_COMPILE_WRC_OUTPUT),$(TOOL_GXX3OMF_COMPILE_AS_CMDS)))
+endef
 
 #------------------------------------------------------------------------------

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

@@ -42 +42 @@
     char.cpp \
     oslibmisc.cpp \
-    ole2nls.cpp \
+    ole2nls.c \
     dbglog.cpp \
     exceptutil.cpp \
@@ -133 +133 @@
     oslibwps.cpp \
     _ras.cpp \
-    kernelrsrc.cpp
+    kernelrsrc.orc
 
 ifndef CUSTOMBUILD