summaryrefslogtreecommitdiff
path: root/vcproj-10
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-01-01 20:43:02 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-01-01 20:43:02 +0000
commit6c4ccacfc199765bb6837da08341f6c7f21464bf (patch)
treebb4e4b7eb6a2a489826b6e5308bd74791def6bd5 /vcproj-10
parent231c0084678af14b7443cbd47da99ebe380fe85c (diff)
downloadhercules-6c4ccacfc199765bb6837da08341f6c7f21464bf.tar.gz
hercules-6c4ccacfc199765bb6837da08341f6c7f21464bf.tar.bz2
hercules-6c4ccacfc199765bb6837da08341f6c7f21464bf.tar.xz
hercules-6c4ccacfc199765bb6837da08341f6c7f21464bf.zip
* Updates to map cache generator tool.
- Removed unmaintained grfio library copy and made the tool use the one in /common instead (related r12726). - Updated makefile to use compile options/libraries determined by configure (bugreport:1109). - Fixed error messages from the tool and grfio library overlapping each other (bugreport:2403). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14646 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'vcproj-10')
-rw-r--r--vcproj-10/mapcache.vcxproj21
1 files changed, 17 insertions, 4 deletions
diff --git a/vcproj-10/mapcache.vcxproj b/vcproj-10/mapcache.vcxproj
index 04c6edc67..47dc9a250 100644
--- a/vcproj-10/mapcache.vcxproj
+++ b/vcproj-10/mapcache.vcxproj
@@ -48,7 +48,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<MinimalRebuild>true</MinimalRebuild>
@@ -90,7 +90,7 @@
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\3rdparty\zlib\include;..\3rdparty\msinttypes\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;MINICORE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -120,11 +120,24 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\src\tool\grfio.c" />
+ <ClCompile Include="..\src\common\core.c" />
+ <ClCompile Include="..\src\common\grfio.c" />
+ <ClCompile Include="..\src\common\malloc.c" />
+ <ClCompile Include="..\src\common\showmsg.c" />
+ <ClCompile Include="..\src\common\strlib.c" />
+ <ClCompile Include="..\src\common\utils.c" />
<ClCompile Include="..\src\tool\mapcache.c" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\src\tool\grfio.h" />
+ <ClInclude Include="..\src\common\cbasetypes.h" />
+ <ClInclude Include="..\src\common\core.h" />
+ <ClInclude Include="..\src\common\grfio.h" />
+ <ClInclude Include="..\src\common\malloc.h" />
+ <ClInclude Include="..\src\common\mmo.h" />
+ <ClInclude Include="..\src\common\showmsg.h" />
+ <ClInclude Include="..\src\common\strlib.h" />
+ <ClInclude Include="..\src\common\utils.h" />
+ <ClInclude Include="..\src\common\version.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">