Ticket #706: Merged branch vs-reorg into trunk:

 - Currently supported platforms are Win32 & WM6 std/pro.
 - Renamed project test_pjsip with pjsip_test, also source directory 'test-pjsip' to 'test'.




git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2638 74dad513-b988-da41-8d7b-12977e46ad98

11 files changed, 172 insertions, 0 deletions

diff --git a/build/vs/pjproject-vs8-common-defaults.vsprops b/build/vs/pjproject-vs8-common-defaults.vsprops
new file mode 100644
index 00000000..91c3b86d
--- /dev/null
+++ b/build/vs/pjproject-vs8-common-defaults.vsprops
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-common-defaults"

+	OutputDirectory=".\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName)"

+	IntermediateDirectory="$(OutDir)"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		BrowseInformation="1"

+		WarningLevel="4"

+		CompileAs="0"

+	/>

+	<Tool

+		Name="VCLibrarianTool"

+		OutputFile="..\lib\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName).lib"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		OutputFile="..\bin\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vs$(VSVer)-$(ConfigurationName).exe"

+	/>

+	<UserMacro

+		Name="VSVer"

+		Value="8"

+	/>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-debug-defaults.vsprops b/build/vs/pjproject-vs8-debug-defaults.vsprops
new file mode 100644
index 00000000..0049dfad
--- /dev/null
+++ b/build/vs/pjproject-vs8-debug-defaults.vsprops
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-debug-defaults"

+	InheritedPropertySheets=".\pjproject-vs8-common-defaults.vsprops"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		Optimization="0"

+		PreprocessorDefinitions="_DEBUG;DEBUG"

+		DebugInformationFormat="4"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		GenerateDebugInformation="true"

+		ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"

+	/>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops b/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops
new file mode 100644
index 00000000..90603570
--- /dev/null
+++ b/build/vs/pjproject-vs8-debug-dynamic-defaults.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-debug-dynamic-defaults"

+	InheritedPropertySheets=".\pjproject-vs8-debug-defaults.vsprops"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		RuntimeLibrary="3"

+	/>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-debug-static-defaults.vsprops b/build/vs/pjproject-vs8-debug-static-defaults.vsprops
new file mode 100644
index 00000000..b1757619
--- /dev/null
+++ b/build/vs/pjproject-vs8-debug-static-defaults.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-debug-static-defaults"

+	InheritedPropertySheets=".\pjproject-vs8-debug-defaults.vsprops"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		RuntimeLibrary="1"

+	/>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-release-defaults.vsprops b/build/vs/pjproject-vs8-release-defaults.vsprops
new file mode 100644
index 00000000..20531548
--- /dev/null
+++ b/build/vs/pjproject-vs8-release-defaults.vsprops
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-release-defaults"

+	InheritedPropertySheets=".\pjproject-vs8-common-defaults.vsprops"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		Optimization="2"

+		PreprocessorDefinitions="NDEBUG"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		LinkIncremental="1"

+	/>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops b/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops
new file mode 100644
index 00000000..bdafe61e
--- /dev/null
+++ b/build/vs/pjproject-vs8-release-dynamic-defaults.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-release-dynamic-defaults"

+	InheritedPropertySheets=".\pjproject-vs8-release-defaults.vsprops"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		RuntimeLibrary="2"

+	/>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-release-static-defaults.vsprops b/build/vs/pjproject-vs8-release-static-defaults.vsprops
new file mode 100644
index 00000000..06a77f56
--- /dev/null
+++ b/build/vs/pjproject-vs8-release-static-defaults.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-release-static-defaults"

+	InheritedPropertySheets=".\pjproject-vs8-release-defaults.vsprops"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		RuntimeLibrary="0"

+	/>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-win32-common-defaults.vsprops b/build/vs/pjproject-vs8-win32-common-defaults.vsprops
new file mode 100644
index 00000000..58e42a1a
--- /dev/null
+++ b/build/vs/pjproject-vs8-win32-common-defaults.vsprops
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-win32-common-defaults"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		PreprocessorDefinitions="WIN32;PJ_WIN32=1;PJ_M_I386=1;"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		SubSystem="1"

+		TargetMachine="1"

+	/>

+	<UserMacro

+		Name="TargetCPU"

+		Value="i386"

+	/>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-win32-release-defaults.vsprops b/build/vs/pjproject-vs8-win32-release-defaults.vsprops
new file mode 100644
index 00000000..33fdc507
--- /dev/null
+++ b/build/vs/pjproject-vs8-win32-release-defaults.vsprops
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-win32-release-defaults"

+	InheritedPropertySheets=".\pjproject-vs8-win32-common-defaults.vsprops"

+	>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-wm6-common-defaults.vsprops b/build/vs/pjproject-vs8-wm6-common-defaults.vsprops
new file mode 100644
index 00000000..f13e2b26
--- /dev/null
+++ b/build/vs/pjproject-vs8-wm6-common-defaults.vsprops
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-wm6-common-defaults"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"

+		DebugInformationFormat="3"

+		DisableSpecificWarnings="4214;4201"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		SubSystem="9"

+	/>

+	<Tool

+		Name="VCResourceCompilerTool"

+		PreprocessorDefinitions="_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;$(ARCHFAM);$(_ARCHFAM_)"

+	/>

+	<UserMacro

+		Name="TargetCPU"

+		Value="armv4i"

+	/>

+</VisualStudioPropertySheet>

diff --git a/build/vs/pjproject-vs8-wm6-release-defaults.vsprops b/build/vs/pjproject-vs8-wm6-release-defaults.vsprops
new file mode 100644
index 00000000..b2c0e1ae
--- /dev/null
+++ b/build/vs/pjproject-vs8-wm6-release-defaults.vsprops
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="pjproject-vs8-wm6-release-defaults"

+	InheritedPropertySheets=".\pjproject-vs8-wm6-common-defaults.vsprops"

+	>

+</VisualStudioPropertySheet>