OSDN Git Service

(root) / nlite / nlite.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e3427b5)
プリプロセッサ定義変更
authorunknown <qwerty2501@users.sourceforge.jp>
Wed, 15 Feb 2012 00:23:26 +0000 (09:23 +0900)
committerunknown <qwerty2501@users.sourceforge.jp>
Wed, 15 Feb 2012 00:23:26 +0000 (09:23 +0900)
JSONParser/JSONParser.vcxproj patch | blob | history
expat/expat.vcxproj patch | blob | history
nlib/nlib.vcxproj patch | blob | history
nlite.suo patch | blob | history
nlite/nlite.vcxproj patch | blob | history
shareCookie/shareCookie.vcxproj patch | blob | history
sqlite3/sqlite3.vcxproj patch | blob | history

diff --git a/JSONParser/JSONParser.vcxproj b/JSONParser/JSONParser.vcxproj
index 71459da..d50b1ba 100644 (file)
--- a/JSONParser/JSONParser.vcxproj
+++ b/JSONParser/JSONParser.vcxproj
@@ -58,7 +58,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;JSON32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;JSON32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -71,7 +71,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;JSON32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;JSON32;_DEBUG;_LIB;JSON32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -86,7 +86,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;JSON32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;JSON32;NDEBUG;_LIB;JSON32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/expat/expat.vcxproj b/expat/expat.vcxproj
index 8ebd5c1..4cd27a3 100644 (file)
--- a/expat/expat.vcxproj
+++ b/expat/expat.vcxproj
@@ -64,7 +64,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFENDEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -77,7 +77,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFENDEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFEXML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE_DEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -92,7 +92,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFENDEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/nlib/nlib.vcxproj b/nlib/nlib.vcxproj
index 447ea67..2544347 100644 (file)
--- a/nlib/nlib.vcxproj
+++ b/nlib/nlib.vcxproj
@@ -50,20 +50,20 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(VCInstallDir)include;$(WindowsSdkDir)include</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
-    <IncludePath>$(SolutionDir);$(SolutionDir)\nlite;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(SolutionDir);$(SolutionDir)\nlite;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir);$(VCInstallDir)include;$(WindowsSdkDir)include;$(SolutionDir)include</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)\include;$(SolutionDir);$(VCInstallDir)include;$(WindowsSdkDir)include;$(SolutionDir)include</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE_DEBUG;_LIB;%(PreprocessorDefinitions);</PreprocessorDefinitions>
       <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <Link>
@@ -76,7 +76,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE_DEBUG;_LIB;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE_DEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
       <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <Link>
@@ -92,7 +92,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE_DEBUG;_LIB;XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFENDEBUG;_LIB;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/nlite.suo b/nlite.suo
index 53917da..ad927be 100644 (file)
Binary files a/nlite.suo and b/nlite.suo differ
diff --git a/nlite/nlite.vcxproj b/nlite/nlite.vcxproj
index 16cf7e5..5445b1d 100644 (file)
--- a/nlite/nlite.vcxproj
+++ b/nlite/nlite.vcxproj
@@ -57,17 +57,18 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-window|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(solutiondir)nlib\;$(solutiondir)memorypool\;$(solutiondir)shareCookie\;$(solutiondir);$(IncludePath)</IncludePath>
+    <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(solutiondir)nlib\;$(solutiondir)memorypool\;$(solutiondir)shareCookie\;$(solutiondir);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(solutiondir)\nlib;$(solutiondir)\include\WTL\include;$(solutiondir);$(solutiondir)\include;$(solutiondir)\expat;$(WDDK)inc\atl71;$(BOOST);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);XML_UNICODE_WCHAR_T</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -79,7 +80,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T_DEBUG;XML_UNICODE_WCHAR_T_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -93,7 +94,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;XML_UNICODE_WCHAR_T_DEBUG;XML_UNICODE_WCHAR_TNDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/shareCookie/shareCookie.vcxproj b/shareCookie/shareCookie.vcxproj
index f0c36a9..762b0a0 100644 (file)
--- a/shareCookie/shareCookie.vcxproj
+++ b/shareCookie/shareCookie.vcxproj
@@ -64,7 +64,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS_DEBUG_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -77,7 +77,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS_DEBUG_LIB;_CRT_SECURE_NO_WARNINGS_DEBUG_CRT_SECURE_NO_WARNINGS_DEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -92,7 +92,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS_DEBUG_LIB;_CRT_SECURE_NO_WARNINGS_DEBUG_CRT_SECURE_NO_WARNINGSNDEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/sqlite3/sqlite3.vcxproj b/sqlite3/sqlite3.vcxproj
index 0ee689d..39894d6 100644 (file)
--- a/sqlite3/sqlite3.vcxproj
+++ b/sqlite3/sqlite3.vcxproj
@@ -64,7 +64,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);SQLITE_LIB_EXPORT;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;SQLITE_LIB_EXPORT;_CRT_SECURE_NO_DEPRECATE;THREADSAFE;_DEBUG;_LIB;%(PreprocessorDefinitions);</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -77,7 +77,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);SQLITE_LIB_EXPORT;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;SQLITE_LIB_EXPORT;_CRT_SECURE_NO_DEPRECATE;THREADSAFE;_DEBUG;_LIB;%(PreprocessorDefinitions);SQLITE_LIB_EXPORT;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -92,7 +92,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);SQLITE_LIB_EXPORT;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;SQLITE_LIB_EXPORT;_CRT_SECURE_NO_DEPRECATE;THREADSAFE;NDEBUG;_LIB;%(PreprocessorDefinitions);SQLITE_LIB_EXPORT;_CRT_SECURE_NO_DEPRECATE;THREADSAFE</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
ニコニコ生放送軽量コメントビューア
About OSDN
Find Software
Develop Software
Help