Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Please consider changes on this fork for Tightdb:master #2

Closed
wants to merge 8 commits into from
Closed

Please consider changes on this fork for Tightdb:master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5335ab2
Introduced bitfield header struct
Oct 10, 2011
51acacb
Review commit 2
Oct 16, 2011
54d38de
Review
Oct 17, 2011
cc6dc9c
Commit
Oct 23, 2011
20c0e14
Merge github.com:Tightdb/tightdb
Oct 24, 2011
da9c14a
Review
Oct 24, 2011
47b6866
Merge remote-tracking branch 'upstream/master'
Oct 24, 2011
1bbccb9
Changed inline to __inline
Oct 24, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions TightDB.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{ED0C49D7-6CFD-4B05-BA18-7C6E98A994C8}"
EndProject
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TightDB", "TightDB.vcxproj", "{C18EDDC1-166A-49C4-B483-11458F48CF8E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest++", "test\UnitTest++\UnitTest++.vsnet2005.vcxproj", "{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}"
Expand Down
9 changes: 7 additions & 2 deletions TightDB.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" --cs-on --cs-condition --cs-hit --cs-full-instrumentation --cs-include-path=&quot;src&quot; --cs-include-path=&quot;test\UnitTest++\src&quot; --cs-include-path=&quot;src\win32&quot;"
Optimization="0"
AdditionalIncludeDirectories="&quot;test\UnitTest++\src&quot;;&quot;UnitTest++\src&quot;;src"
AdditionalIncludeDirectories="&quot;test\UnitTest++\src&quot;;&quot;UnitTest++\src&quot;;src;src\win32"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRTDBG_MAP_ALLOC;_CRTDBG_MAP_ALLOC_NEW"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
StructMemberAlignment="0"
UsePrecompiledHeader="0"
WarningLevel="4"
DebugInformationFormat="4"
Expand All @@ -64,6 +66,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" --cs-on --cs-condition --cs-hit --cs-full-instrumentation --cs-libgen=/MDd"
AdditionalDependencies="Debug\UnitTest++.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
Expand Down Expand Up @@ -117,6 +120,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions=" --cs-on --cs-condition --cs-hit --cs-partial-instrumentation --cs-include-path=&quot;src&quot; --cs-include-path=&quot;test\UnitTest++\src&quot; --cs-full-instrumentation"
Optimization="0"
AdditionalIncludeDirectories="&quot;test\UnitTest++\src&quot;;&quot;UnitTest++\src&quot;;src"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRTDBG_MAP_ALLOC;_CRTDBG_MAP_ALLOC_NEW"
Expand All @@ -138,6 +142,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=" --cs-on --cs-condition --cs-hit --cs-partial-instrumentation --cs-libgen=/MDd --cs-full-instrumentation"
AdditionalDependencies="x64\Debug\UnitTest++.lib"
LinkIncremental="2"
GenerateDebugInformation="true"
Expand Down Expand Up @@ -193,7 +198,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;test\UnitTest++\src&quot;;&quot;UnitTest++\src&quot;;src"
AdditionalIncludeDirectories="&quot;test\UnitTest++\src&quot;;&quot;UnitTest++\src&quot;;src;src\win32"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
Expand Down
214 changes: 0 additions & 214 deletions TightDB.vcxproj
View file
Open in desktop

This file was deleted.

Loading