aboutsummaryrefslogtreecommitdiff
path: root/boost/common
diff options
context:
space:
mode:
Diffstat (limited to 'boost/common')
-rw-r--r--boost/common/boost-common-vc10.sln (renamed from boost/common/common-vc10.sln)0
-rw-r--r--boost/common/boost-common-vc9.sln (renamed from boost/common/common-vc9.sln)0
-rw-r--r--boost/common/makefile2
-rw-r--r--boost/common/template/makefile2
-rw-r--r--boost/common/template/template-vc10.vcxproj18
-rw-r--r--boost/common/template/template-vc9.vcproj18
6 files changed, 20 insertions, 20 deletions
diff --git a/boost/common/common-vc10.sln b/boost/common/boost-common-vc10.sln
index 9a5dc32..9a5dc32 100644
--- a/boost/common/common-vc10.sln
+++ b/boost/common/boost-common-vc10.sln
diff --git a/boost/common/common-vc9.sln b/boost/common/boost-common-vc9.sln
index 2ec9432..2ec9432 100644
--- a/boost/common/common-vc9.sln
+++ b/boost/common/boost-common-vc9.sln
diff --git a/boost/common/makefile b/boost/common/makefile
index eeb083e..4af0162 100644
--- a/boost/common/makefile
+++ b/boost/common/makefile
@@ -18,7 +18,7 @@ clean := $(out_base)/.clean
$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests)))
-name := $(notdir $(src_base))
+name := boost-common
$(dist): name := $(name)
$(dist): export dirs := $(tests)
$(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \
diff --git a/boost/common/template/makefile b/boost/common/template/makefile
index d22654e..1a97660 100644
--- a/boost/common/template/makefile
+++ b/boost/common/template/makefile
@@ -58,7 +58,7 @@ $(out_base)/: $(driver)
# Dist
#
-name := $(notdir $(src_base))
+name := $(subst /,-,$(subst $(src_root)/boost/common/,,$(src_base)))
$(dist): db_id := @database@
$(dist): sources := $(cxx_tun)
diff --git a/boost/common/template/template-vc10.vcxproj b/boost/common/template/template-vc10.vcxproj
index 44c2813..e3c66a6 100644
--- a/boost/common/template/template-vc10.vcxproj
+++ b/boost/common/template/template-vc10.vcxproj
@@ -89,11 +89,11 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
@@ -105,11 +105,11 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
@@ -123,11 +123,11 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -143,11 +143,11 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..\..\libcommon</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\..\..\libcommon</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4068;4355;4800;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -158,7 +158,7 @@
__custom_build_entry__(
test.hxx,
odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I..\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
test-odb.hxx;test-odb.ixx;test-odb.cxx)
</ItemGroup>
<ItemGroup>
diff --git a/boost/common/template/template-vc9.vcproj b/boost/common/template/template-vc9.vcproj
index e024770..b22262b 100644
--- a/boost/common/template/template-vc9.vcproj
+++ b/boost/common/template/template-vc9.vcproj
@@ -45,7 +45,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\libcommon"
+ AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -65,7 +65,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\libcommon\lib\common-d.lib odb-__value__(database)-d.lib odb-boost-d.lib odb-d.lib"
+ AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib\common-d.lib odb-__value__(database)-d.lib odb-boost-d.lib odb-d.lib"
OutputFile="$(OutDir)\driver.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -122,7 +122,7 @@
AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\libcommon"
+ AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -141,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\libcommon\lib\common.lib odb-__value__(database).lib odb-boost.lib odb.lib"
+ AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib\common.lib odb-__value__(database).lib odb-boost.lib odb.lib"
OutputFile="$(OutDir)\driver.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
@@ -199,7 +199,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\libcommon"
+ AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -219,7 +219,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\libcommon\lib64\common-d.lib odb-__value__(database)-d.lib odb-boost-d.lib odb-d.lib"
+ AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib64\common-d.lib odb-__value__(database)-d.lib odb-boost-d.lib odb-d.lib"
OutputFile="$(OutDir)\driver.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
@@ -277,7 +277,7 @@
AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290"
Optimization="2"
EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="..\..\..\libcommon"
+ AdditionalIncludeDirectories="$(SolutionDir)\..\..\libcommon"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -296,7 +296,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\..\libcommon\lib64\common.lib odb-__value__(database).lib odb-boost.lib odb.lib"
+ AdditionalDependencies="$(SolutionDir)\..\..\libcommon\lib64\common.lib odb-__value__(database).lib odb-boost.lib odb.lib"
OutputFile="$(OutDir)\driver.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
@@ -348,7 +348,7 @@ __source_entries__(extra_sources)
__file_entry_custom_build__(
test.hxx,
odb test.hxx,
-odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I..\..\..\libcommon)) test.hxx,
+odb.exe __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\..\libcommon)) test.hxx,
test-odb.hxx;test-odb.ixx;test-odb.cxx)
__file_entry__(test-odb.hxx)
__file_entry__(test-odb.ixx)
generated by cgit v1.1 at 2024-11-01 17:24:32 +0000