aboutsummaryrefslogtreecommitdiff
path: root/src/tools/vmap3_assembler
diff options
context:
space:
mode:
authorShauren <none@none>2010-06-15 17:08:04 +0200
committerShauren <none@none>2010-06-15 17:08:04 +0200
commitebb07858170c7552439ce0afd9395d93b79e2eb8 (patch)
tree752c44cf277578cb15eada4b0a7346e6004aecf7 /src/tools/vmap3_assembler
parent2a544c94b39238a353b8ec896936c7a6f00b53f8 (diff)
Commit from Lynx3d: Add assert to values that can cause nasty freeze, but should never occur with
valid input. --HG-- branch : trunk
Diffstat (limited to 'src/tools/vmap3_assembler')
-rw-r--r--src/tools/vmap3_assembler/CMakeLists.txt1
-rw-r--r--src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index b3b16d540c7..62eaca7e13f 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -14,6 +14,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/collision/Maps
${CMAKE_SOURCE_DIR}/src/server/collision/Models
${CMAKE_SOURCE_DIR}/src/server/shared
+ ${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
${ACE_INCLUDE_DIR}
)
diff --git a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
index e3b1b7766a5..b7c0e7719b3 100644
--- a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
+++ b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj
@@ -42,7 +42,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared"
+ AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -124,7 +124,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared"
+ AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableEnhancedInstructionSet="1"