differentiate Debug mode DLLs with a "d" suffix

FlyingOE · Oct 31, 2018 · 010af45 · 010af45
1 parent 1aa559f
commit 010af45
Show file tree

Hide file tree

Showing 22 changed files with 80 additions and 15 deletions.
diff --git a/TDB_API/TDB_API.vcxproj b/TDB_API/TDB_API.vcxproj
@@ -69,10 +69,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>

diff --git a/TDB_API/Wind_TDB.q b/TDB_API/Wind_TDB.q
@@ -8,7 +8,8 @@
 
 / Path to {@literal TDB_API.dll}<p>
 / NOTE: When loaded from within TorQ, a {@literal $KDBLIB}-based path is constructed.
-DLL:hsym`${$[x~"";"";x,y]}[getenv[`KDBLIB];"/",string[.z.o],"/"],"TDB_API"
+/ NOTE: When global {@code NDEBUG} is defined to be 0b, debug DLL will be loaded instead.
+DLL:hsym`${$[x~"";"";x,y]}[getenv[`KDBLIB];"/",string[.z.o],"/"],"TDB_API",$[@[value;`..NDEBUG;{1b}];"";"d"]
 
 / Version of {@literal TDB_API.dll}
 version:DLL 2:(`version;1);

diff --git a/Test_Wind_API/Test_Wind.q b/Test_Wind_API/Test_Wind.q
@@ -3,6 +3,7 @@
 \c 25 2000
 
 // Load Wind_API
+NDEBUG:0b
 /system" "sv("cd";1_string LIB_DIR)
 \l kdb+.q
 \l Wind.q

diff --git a/Test_Wind_API/Test_Wind_API.vcxproj b/Test_Wind_API/Test_Wind_API.vcxproj
@@ -22,7 +22,6 @@
     <ProjectGuid>{41577929-CFDA-42D7-9A03-8F77023A8D8A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Test_Wind_API</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/Wind.util/StringEncoders.h b/Wind.util/StringEncoders.h
@@ -1,6 +1,5 @@
 #ifndef __STRINGENCODERS_H__
 #define __STRINGENCODERS_H__
-#pragma comment(lib, "Wind.util.lib")
 
 #include <string>
 
@@ -25,4 +24,10 @@ namespace Wind {
 
 #include "StringEncoders.inl"
 
+#ifdef NDEBUG
+#	pragma comment(lib, "Wind.util.lib")
+#else
+#	pragma comment(lib, "Wind.utild.lib")
+#endif
+
 #endif//__STRINGENCODERS_H__
diff --git a/Wind.util/Wind.util.vcxproj b/Wind.util/Wind.util.vcxproj
@@ -68,9 +68,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/Wind_API/Wind.q b/Wind_API/Wind.q
@@ -8,7 +8,8 @@
 
 / Path to {@literal Wind_API.dll}<p>
 / NOTE: When loaded from within TorQ, a {@literal $KDBLIB}-based path is constructed.
-DLL:hsym`${$[x~"";"";x,y]}[getenv[`KDBLIB];"/",string[.z.o],"/"],"Wind_API"
+/ NOTE: When global {@code NDEBUG} is defined to be 0b, debug DLL will be loaded instead.
+DLL:hsym`${$[x~"";"";x,y]}[getenv[`KDBLIB];"/",string[.z.o],"/"],"Wind_API",$[@[value;`..NDEBUG;{1b}];"";"d"]
 
 / Version of {@literal Wind_API.dll}
 version:DLL 2:(`version;1);

diff --git a/Wind_API/Wind_API.vcxproj b/Wind_API/Wind_API.vcxproj
@@ -69,10 +69,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>

diff --git a/kdb+.hack/hack.h b/kdb+.hack/hack.h
@@ -10,7 +10,11 @@ namespace q {
 	K q::krr(S const error) { return static_cast<K>(0); }
 	K q::orr(S const error) { return static_cast<K>(0); }
 #else
-#	pragma comment(lib, "kdb+.hack.lib")
+#   ifdef NDEBUG
+#       pragma comment(lib, "kdb+.hack.lib")
+#   else
+#       pragma comment(lib, "kdb+.hackd.lib")
+#   endif
 #endif
 
 #endif//__KDB_HACK__HACK_H__
diff --git a/kdb+.hack/kdb+.hack.vcxproj b/kdb+.hack/kdb+.hack.vcxproj
@@ -21,7 +21,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0D958CB7-1F8E-4F2E-81DA-5ECD1CC4FDFE}</ProjectGuid>
     <RootNamespace>kdbhack</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -68,9 +67,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -80,6 +81,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)inc\q\;$(SolutionDir)..\q_Wind\inc\q\</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <EnablePREfast>true</EnablePREfast>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -94,6 +96,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)inc\q\;$(SolutionDir)..\q_Wind\inc\q\</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
       <EnablePREfast>true</EnablePREfast>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -109,6 +112,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)inc\q\;$(SolutionDir)..\q_Wind\inc\q\</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -126,6 +130,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)inc\q\;$(SolutionDir)..\q_Wind\inc\q\</AdditionalIncludeDirectories>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/kdb+.util/init.h b/kdb+.util/init.h
@@ -1,6 +1,5 @@
 #ifndef __INIT_H__
 #define __INIT_H__
-#pragma comment(lib, "kdb+.util.lib")
 
 /**
  * @see http://code.kx.com/q//interfaces/c-client-for-q/
@@ -15,4 +14,10 @@ namespace q {
 
 }//namespace q
 
+#ifdef NDEBUG
+#	pragma comment(lib, "kdb+.util.lib")
+#else
+#	pragma comment(lib, "kdb+.utild.lib")
+#endif
+
 #endif//__INIT_H__
diff --git a/kdb+.util/kdb+.util.vcxproj b/kdb+.util/kdb+.util.vcxproj
@@ -68,9 +68,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/kdb+.util/multilang.h b/kdb+.util/multilang.h
@@ -1,6 +1,5 @@
 #ifndef __MULTILANG_H__
 #define __MULTILANG_H__
-#pragma comment(lib, "kdb+.util.lib")
 
 #include <string>
 
@@ -21,4 +20,10 @@ namespace q {
 
 }//namespace q
 
+#ifdef NDEBUG
+#	pragma comment(lib, "kdb+.util.lib")
+#else
+#	pragma comment(lib, "kdb+.utild.lib")
+#endif
+
 #endif//__MULTILANG_H__
diff --git a/kdb+.util/type_convert.h b/kdb+.util/type_convert.h
@@ -1,6 +1,5 @@
 #ifndef __TYPE_CONVERT_H__
 #define __TYPE_CONVERT_H__
-#pragma comment(lib, "kdb+.util.lib")
 
 #include "multilang.h"
 
@@ -68,4 +67,10 @@ namespace q {
 
 #include "Cookbook.inl"
 
+#ifdef NDEBUG
+#	pragma comment(lib, "kdb+.util.lib")
+#else
+#	pragma comment(lib, "kdb+.utild.lib")
+#endif
+
 #endif//__TYPE_CONVERT_H__
diff --git a/kdb+.util/util.h b/kdb+.util/util.h
@@ -1,6 +1,5 @@
 #ifndef __KDB__UTIL_H__
 #define __KDB__UTIL_H__
-#pragma comment(lib, "kdb+.util.lib")
 
 #include "multilang.h"
 
@@ -24,4 +23,10 @@ namespace q {
 
 #include "util.inl"
 
+#ifdef NDEBUG
+#	pragma comment(lib, "kdb+.util.lib")
+#else
+#	pragma comment(lib, "kdb+.utild.lib")
+#endif
+
 #endif//__KDB__UTIL_H__
diff --git a/kdb+/kdb+.q b/kdb+/kdb+.q
@@ -1,8 +1,9 @@
 \d .CE
 
 / Path to {@literal kdb+.dll}<p>
-/ NOTE: When loaded from within TorQ, a {@literal $KDBLIB}-based path is constructed. 
-DLL:hsym`${$[x~"";"";x,y]}[getenv[`KDBLIB];"/",string[.z.o],"/"],"kdb+"
+/ NOTE: When loaded from within TorQ, a {@literal $KDBLIB}-based path is constructed.<p>
+/ NOTE: When global {@code NDEBUG} is defined to be 0b, debug DLL will be loaded instead.
+DLL:hsym`${$[x~"";"";x,y]}[getenv[`KDBLIB];"/",string[.z.o],"/"],"kdb+",$[@[value;`..NDEBUG;{1b}];"";"d"]
 
 / Version of {@literal kdb+.dll}
 version:DLL 2:(`version;1);

diff --git a/kdb+/kdb+.vcxproj b/kdb+/kdb+.vcxproj
@@ -69,10 +69,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>

diff --git a/win32.util/CodeConvert.h b/win32.util/CodeConvert.h
@@ -1,6 +1,5 @@
 #ifndef __CODECONVERT_H__
 #define __CODECONVERT_H__
-#pragma comment(lib, "win32.util.lib")
 
 #include <string>
 #include <stdexcept>
@@ -25,4 +24,10 @@ namespace ml {
 
 }//namespace ml
 
+#ifdef NDEBUG
+#	pragma comment(lib, "win32.util.lib")
+#else
+#	pragma comment(lib, "win32.utild.lib")
+#endif
+
 #endif//__CODECONVERT_H__
diff --git a/win32.util/SocketPair.h b/win32.util/SocketPair.h
@@ -1,6 +1,5 @@
 #ifndef __SOCKETPAIR_H__
 #define __SOCKETPAIR_H__
-#pragma comment(lib, "win32.util.lib")
 
 #include <WS2tcpip.h>
 #pragma comment(lib, "ws2_32.lib")
@@ -29,4 +28,10 @@ namespace SockPair {
 
 }//namespace SockPair
 
+#ifdef NDEBUG
+#	pragma comment(lib, "win32.util.lib")
+#else
+#	pragma comment(lib, "win32.utild.lib")
+#endif
+
 #endif//__SOCKETPAIR_H__
diff --git a/win32.util/hexDump.h b/win32.util/hexDump.h
@@ -1,6 +1,5 @@
 #ifndef __HEXDUMP_H__
 #define __HEXDUMP_H__
-#pragma comment(lib, "win32.util.lib")
 
 #include "msvc.h"
 
@@ -37,4 +36,10 @@ namespace util {
 
 #include "hexDump.inl"
 
+#ifdef NDEBUG
+#	pragma comment(lib, "win32.util.lib")
+#else
+#	pragma comment(lib, "win32.utild.lib")
+#endif
+
 #endif//__HEXDUMP_H__
diff --git a/win32.util/win32.util.vcxproj b/win32.util/win32.util.vcxproj
@@ -68,9 +68,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

diff --git a/win32_com/win32_com.vcxproj b/win32_com/win32_com.vcxproj
@@ -41,6 +41,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>