Changeset 2838 for trunk/src/kWorker/Makefile.kmk

Timestamp:

Aug 25, 2016, 11:46:25 PM (9 years ago)

Author:

bird

Message:

kWorker: A little more hacking.

File:

• trunk/src/kWorker/Makefile.kmk (modified) (4 diffs)

trunk/src/kWorker/Makefile.kmk

@@ -24 +24 @@
 #
 
-## @todo fixme!!!
-KBUILD_WITH_STATIC_MSVCRT = 1
 
 SUB_DEPTH = ../..
@@ -32 +30 @@
 
 PROGRAMS += kWorker
-kWorker_TEMPLATE = BIN
+kWorker_TEMPLATE = BIN-STATIC-THREADED
 kWorker_INCS = kStuff/include
 kWorker_DEFS.debug = K_STRICT
@@ -39 +37 @@
 kWorker_LIBS = \
         $(kStuff_1_TARGET) \
-        $(LIB_KDEP) \
-        $(LIB_KUTIL)
+        $(kWorkerLib_1_TARGET)
 include $(KBUILD_PATH)/sdks/WINDDK71.kmk
 kWorker_LIBS.win = \
-        $(TEMPLATE_BIN_LIBS) \
+        $(TEMPLATE_BIN-STATIC-THREADED_LIBS) \
         $(PATH_SDK_WINDDK71_LIB_WNET)/ntdll.lib
 kWorker_LDFLAGS.win = \
@@ -50 +47 @@
 
 #
+# Stuff from ../libs.  Need to rebuilt it with static CRT.
+#
+LIBRARIES += kWorkerLib
+kWorkerLib_TEMPLATE = LIB-STATIC-THREADED
+kWorkerLib_DEFPATH = ../lib # Need fix from r2837.
+kWorkerLib_DEFPATH := $(PATH_SUB_CURRENT)/../lib
+kWorkerLib_SOURCES = \
+        crc32.c \
+        md5.c
+kWorkerLib_SOURCES.win = \
+        nt_fullpath.c \
+        quoted_spawn.c \
+       nt/nthlpcore.c \
+       nt/nthlpfs.c \
+       nt/ntdir.c \
+       nt/ntstat.c \
+       nt/ntunlink.c
+
+#
 # kStuff library.
 #
 LIBRARIES += kStuff
-kStuff_TEMPLATE = LIB
+kStuff_TEMPLATE = LIB-STATIC-THREADED
 kStuff_DEFS.debug = K_STRICT
 kStuff_INCS = kStuff/include