Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/windirstat/windirstat.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author"Oliver Schneider ext:(%22) <oliver@assarbad.net>2011-02-20 03:24:47 +0300
committer"Oliver Schneider ext:(%22) <oliver@assarbad.net>2011-02-20 03:24:47 +0300
commita9968e52f0ee9e680e7688441966280f07f5e3e5 (patch)
tree34f4ec5bb325ae9c5be31e163548d3aea2f04ce4
parent77cb9cbfbf83c728f1bb4cceed4bc4418922ab5b (diff)
- Fixing include path, so we have a global one to refer to (now with the sandbox project)
Diffstat
-rw-r--r--common/commonhelpers.h2
-rw-r--r--common/version.h4
-rw-r--r--sandbox/luaconf/lua_conf.vcproj16
-rw-r--r--windirstat/aboutdlg.cpp2
-rw-r--r--windirstat/aboutdlg.h2
-rw-r--r--windirstat/dirstatdoc.h2
-rw-r--r--windirstat/globalhelpers.h2
-rw-r--r--windirstat/item.h2
-rw-r--r--windirstat/mainframe.cpp2
-rw-r--r--windirstat/mainframe.h2
-rw-r--r--windirstat/mountpoints.h2
-rw-r--r--windirstat/myimagelist.h2
-rw-r--r--windirstat/options.h4
-rw-r--r--windirstat/stdafx.h10
-rw-r--r--windirstat/windirstat.vs2005.vcproj16
-rw-r--r--windirstat/windirstat.vs2008.vcproj16
16 files changed, 47 insertions, 39 deletions
diff --git a/common/commonhelpers.h b/common/commonhelpers.h
index 9a145a1..f1f26c1 100644
--- a/common/commonhelpers.h
+++ b/common/commonhelpers.h
@@ -26,7 +26,7 @@
#define __WDS_COMMONHELPERS_H__
#pragma once
-#include "../common/wds_constants.h"
+#include <common/wds_constants.h>
BOOL ShellExecuteThrow(HWND hwnd, LPCTSTR lpVerb, LPCTSTR lpFile, LPCTSTR lpParameters, LPCTSTR lpDirectory, INT nShowCmd);
BOOL ShellExecuteNoThrow(HWND hwnd, LPCTSTR lpVerb, LPCTSTR lpFile, LPCTSTR lpParameters, LPCTSTR lpDirectory, INT nShowCmd);
diff --git a/common/version.h b/common/version.h
index f59623e..eb85bb1 100644
--- a/common/version.h
+++ b/common/version.h
@@ -57,7 +57,7 @@
// This will not change to often, but the years need to be modified
// regularly, so it can be in one central place
-#define VN_COPYRIGHTSTRING "Copyright (C) 2003-2005 Bernhard Seifert, (C) 2004-2006, 2008 Oliver Schneider"
+#define VN_COPYRIGHTSTRING "Copyright (C) 2003-2005 Bernhard Seifert, (C) 2004-2011 Oliver Schneider"
//-------------------------------------------------------------------
// Version number. Relevant for BC_RELEASECANDIDATE and BC_RELEASE.
@@ -69,7 +69,7 @@
// Format: #define blank LINKCOUNT blanks decimal
// Reset this to zero only when you increment VERNUM_MAJOR/MINOR/REVISION.
-#include "../common/buildnumber.h"
+#include <common/buildnumber.h>
//-------------------------------------------------------------------
// Release candidate number. Relevant for BC_RELEASECANDIDATE.
diff --git a/sandbox/luaconf/lua_conf.vcproj b/sandbox/luaconf/lua_conf.vcproj
index d984b86..09602fc 100644
--- a/sandbox/luaconf/lua_conf.vcproj
+++ b/sandbox/luaconf/lua_conf.vcproj
@@ -46,7 +46,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)\..\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\..\lua\src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)\..\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\..\lua\src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -207,7 +207,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(ProjectDir)\..\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\..\lua\src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="2"
@@ -288,7 +288,7 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(ProjectDir)\..\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\..\lua\src"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="2"
@@ -354,6 +354,10 @@
>
</File>
<File
+ RelativePath="..\..\windirstat\options.cpp"
+ >
+ </File>
+ <File
RelativePath=".\stdafx.cpp"
>
<FileConfiguration
@@ -440,6 +444,10 @@
>
</File>
<File
+ RelativePath="..\..\windirstat\options.h"
+ >
+ </File>
+ <File
RelativePath=".\Resource.h"
>
</File>
diff --git a/windirstat/aboutdlg.cpp b/windirstat/aboutdlg.cpp
index 05cf1ce..debbd80 100644
--- a/windirstat/aboutdlg.cpp
+++ b/windirstat/aboutdlg.cpp
@@ -24,7 +24,7 @@
#include "stdafx.h"
#include "windirstat.h"
-#include "../common/version.h"
+#include <common/version.h>
#include "aboutdlg.h"
#ifdef _DEBUG
diff --git a/windirstat/aboutdlg.h b/windirstat/aboutdlg.h
index 60b90f8..2e0f76e 100644
--- a/windirstat/aboutdlg.h
+++ b/windirstat/aboutdlg.h
@@ -27,7 +27,7 @@
#pragma once
#include "layout.h"
-#include "../common/wds_constants.h"
+#include <common/wds_constants.h>
void StartAboutDialog();
diff --git a/windirstat/dirstatdoc.h b/windirstat/dirstatdoc.h
index 1090cff..9352473 100644
--- a/windirstat/dirstatdoc.h
+++ b/windirstat/dirstatdoc.h
@@ -27,7 +27,7 @@
#pragma once
#include "selectdrivesdlg.h"
-#include "../common/wds_constants.h"
+#include <common/wds_constants.h>
class CItem;
diff --git a/windirstat/globalhelpers.h b/windirstat/globalhelpers.h
index 12df306..1c416f8 100644
--- a/windirstat/globalhelpers.h
+++ b/windirstat/globalhelpers.h
@@ -27,7 +27,7 @@
#ifndef __WDS_GLOBALHELPERS_H__
#define __WDS_GLOBALHELPERS_H__
#pragma once
-#include "../common/wds_constants.h"
+#include <common/wds_constants.h>
CString GetLocaleString(LCTYPE lctype, LANGID langid);
CString GetLocaleLanguage(LANGID langid);
diff --git a/windirstat/item.h b/windirstat/item.h
index 00c4262..e6e748f 100644
--- a/windirstat/item.h
+++ b/windirstat/item.h
@@ -30,7 +30,7 @@
#include "treemap.h"
#include "dirstatdoc.h" // CExtensionData
#include "FileFindWDS.h" // CFileFindWDS
-#include "../common/wds_constants.h"
+#include <common/wds_constants.h>
// Columns
enum
diff --git a/windirstat/mainframe.cpp b/windirstat/mainframe.cpp
index d4f644f..9c04ec0 100644
--- a/windirstat/mainframe.cpp
+++ b/windirstat/mainframe.cpp
@@ -37,7 +37,7 @@
#include "pagetreemap.h"
#include "pagegeneral.h"
-#include "../common/version.h"
+#include <common/version.h>
#include "mainframe.h"
diff --git a/windirstat/mainframe.h b/windirstat/mainframe.h
index 7038197..e140802 100644
--- a/windirstat/mainframe.h
+++ b/windirstat/mainframe.h
@@ -27,7 +27,7 @@
#pragma once
#include "pacman.h"
-#include "../common/wds_constants.h"
+#include <common/wds_constants.h>
class CMySplitterWnd;
class CMainFrame;
diff --git a/windirstat/mountpoints.h b/windirstat/mountpoints.h
index 2ac7c9a..4d14f2c 100644
--- a/windirstat/mountpoints.h
+++ b/windirstat/mountpoints.h
@@ -26,7 +26,7 @@
#define __WDS_MOUNTPOINTS_H__
#pragma once
-#include "../common/wds_constants.h"
+#include <common/wds_constants.h>
class CReparsePoints
{
diff --git a/windirstat/myimagelist.h b/windirstat/myimagelist.h
index 694865d..0ca8dd2 100644
--- a/windirstat/myimagelist.h
+++ b/windirstat/myimagelist.h
@@ -26,7 +26,7 @@
#define __WDS_MYIMAGELIST_H__
#pragma once
-#include "../common/wds_constants.h"
+#include <common/wds_constants.h>
//
// CMyImageList. Both CDirstatView and CTypeView use this central
diff --git a/windirstat/options.h b/windirstat/options.h
index 97f0d55..e09fb64 100644
--- a/windirstat/options.h
+++ b/windirstat/options.h
@@ -27,8 +27,8 @@
#pragma once
#include "treemap.h"
-#include "../common/wds_constants.h"
-#include "../common/SimpleIni.h"
+#include <common/wds_constants.h>
+#include <common/SimpleIni.h>
#include <atlbase.h> // CRegKey
#include <memory>
diff --git a/windirstat/stdafx.h b/windirstat/stdafx.h
index 0d577a8..52d6cfb 100644
--- a/windirstat/stdafx.h
+++ b/windirstat/stdafx.h
@@ -54,11 +54,11 @@
#include <atlbase.h> // USES_CONVERSION, ComPtr<>
-#include "../common/mdexceptions.h"
-#include "../common/cotaskmem.h"
-#include "../common/commonhelpers.h"
-#include "../common/platform.h"
-#include "../common/tracer.h"
+#include <common/mdexceptions.h>
+#include <common/cotaskmem.h>
+#include <common/commonhelpers.h>
+#include <common/platform.h>
+#include <common/tracer.h>
#include "../common\wds_constants.h"
#define RGB_GET_RVALUE(rgb) (rgb & 0xFF)
diff --git a/windirstat/windirstat.vs2005.vcproj b/windirstat/windirstat.vs2005.vcproj
index 984d317..86a345e 100644
--- a/windirstat/windirstat.vs2005.vcproj
+++ b/windirstat/windirstat.vs2005.vcproj
@@ -46,7 +46,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\lua\src"
PreprocessorDefinitions="WINVER=0x0500;_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -67,7 +67,7 @@
AdditionalOptions="/nologo"
PreprocessorDefinitions="WINVER=0x0500;_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -138,7 +138,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\lua\src"
PreprocessorDefinitions="WINVER=0x0500;_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -159,7 +159,7 @@
AdditionalOptions="/nologo"
PreprocessorDefinitions="WINVER=0x0500;_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -233,7 +233,7 @@
Optimization="3"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="$(ProjectDir)\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\lua\src"
PreprocessorDefinitions="WINVER=0x0500;NDEBUG"
MinimalRebuild="false"
RuntimeLibrary="0"
@@ -251,7 +251,7 @@
AdditionalOptions="/nologo"
PreprocessorDefinitions="WINVER=0x0500;NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -328,7 +328,7 @@
Optimization="3"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="$(ProjectDir)\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\lua\src"
PreprocessorDefinitions="WINVER=0x0500;NDEBUG"
MinimalRebuild="false"
RuntimeLibrary="0"
@@ -346,7 +346,7 @@
AdditionalOptions="/nologo"
PreprocessorDefinitions="WINVER=0x0500;NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
diff --git a/windirstat/windirstat.vs2008.vcproj b/windirstat/windirstat.vs2008.vcproj
index 9b7e9a3..2b33d60 100644
--- a/windirstat/windirstat.vs2008.vcproj
+++ b/windirstat/windirstat.vs2008.vcproj
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\lua\src"
PreprocessorDefinitions="WINVER=0x0500;_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
AdditionalOptions="/nologo"
PreprocessorDefinitions="WINVER=0x0500;_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -138,7 +138,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\lua\src"
PreprocessorDefinitions="WINVER=0x0500;_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -159,7 +159,7 @@
AdditionalOptions="/nologo"
PreprocessorDefinitions="WINVER=0x0500;_DEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -232,7 +232,7 @@
Optimization="3"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="$(ProjectDir)\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\lua\src"
PreprocessorDefinitions="WINVER=0x0500;NDEBUG"
MinimalRebuild="false"
RuntimeLibrary="0"
@@ -250,7 +250,7 @@
AdditionalOptions="/nologo"
PreprocessorDefinitions="WINVER=0x0500;NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
@@ -326,7 +326,7 @@
Optimization="3"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="$(ProjectDir)\..\lua\src"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(ProjectDir)\..\lua\src"
PreprocessorDefinitions="WINVER=0x0500;NDEBUG"
MinimalRebuild="false"
RuntimeLibrary="0"
@@ -344,7 +344,7 @@
AdditionalOptions="/nologo"
PreprocessorDefinitions="WINVER=0x0500;NDEBUG"
Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)\..;$(IntDir)"
/>
<Tool
Name="VCPreLinkEventTool"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 14:02:35 +0300