From ad84a663bea9521bd553c5ae8a248febcac0a45e Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Thu, 19 Jun 2014 11:27:07 -0700 Subject: [PATCH] Added 64bit configuration to VS project, and fixed dangling project references. Change-Id: I7a0713e3357fc421fcaa6771c9440f2b2f5f58f6 Tested: with VS2010 --- build/VS2010/FlatBuffers.sln | 36 ++++----- build/VS2010/flatc.vcxproj | 124 +++++++++++++++++++++++++++-- build/VS2010/flatc.vcxproj.user | 17 +++- build/VS2010/flatsamplebinary.vcxproj | 124 +++++++++++++++++++++++++++-- build/VS2010/flatsamplebinary.vcxproj.user | 8 ++ build/VS2010/flatsampletext.vcxproj | 124 +++++++++++++++++++++++++++-- build/VS2010/flatsampletext.vcxproj.user | 8 ++ build/VS2010/flattests.vcxproj | 124 +++++++++++++++++++++++++++-- build/VS2010/flattests.vcxproj.user | 8 ++ 9 files changed, 534 insertions(+), 39 deletions(-) diff --git a/build/VS2010/FlatBuffers.sln b/build/VS2010/FlatBuffers.sln index 06de6f8..ac03fdf 100755 --- a/build/VS2010/FlatBuffers.sln +++ b/build/VS2010/FlatBuffers.sln @@ -11,43 +11,43 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - MinSizeRel|Win32 = MinSizeRel|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 - RelWithDebInfo|Win32 = RelWithDebInfo|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {5B5857E1-64E2-4CED-A12E-45E1B3880496}.Debug|Win32.ActiveCfg = Debug|Win32 {5B5857E1-64E2-4CED-A12E-45E1B3880496}.Debug|Win32.Build.0 = Debug|Win32 - {5B5857E1-64E2-4CED-A12E-45E1B3880496}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {5B5857E1-64E2-4CED-A12E-45E1B3880496}.MinSizeRel|Win32.Build.0 = Release|Win32 + {5B5857E1-64E2-4CED-A12E-45E1B3880496}.Debug|x64.ActiveCfg = Debug|x64 + {5B5857E1-64E2-4CED-A12E-45E1B3880496}.Debug|x64.Build.0 = Debug|x64 {5B5857E1-64E2-4CED-A12E-45E1B3880496}.Release|Win32.ActiveCfg = Release|Win32 {5B5857E1-64E2-4CED-A12E-45E1B3880496}.Release|Win32.Build.0 = Release|Win32 - {5B5857E1-64E2-4CED-A12E-45E1B3880496}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {5B5857E1-64E2-4CED-A12E-45E1B3880496}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {5B5857E1-64E2-4CED-A12E-45E1B3880496}.Release|x64.ActiveCfg = Release|x64 + {5B5857E1-64E2-4CED-A12E-45E1B3880496}.Release|x64.Build.0 = Release|x64 {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.Debug|Win32.ActiveCfg = Debug|Win32 {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.Debug|Win32.Build.0 = Debug|Win32 - {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.MinSizeRel|Win32.Build.0 = Release|Win32 + {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.Debug|x64.ActiveCfg = Debug|x64 + {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.Debug|x64.Build.0 = Debug|x64 {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.Release|Win32.ActiveCfg = Release|Win32 {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.Release|Win32.Build.0 = Release|Win32 - {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.Release|x64.ActiveCfg = Release|x64 + {16FA5518-3DE1-4B15-A1E0-F4734C276FB4}.Release|x64.Build.0 = Release|x64 {F0A15675-1017-4217-BB5B-3372F2C636AB}.Debug|Win32.ActiveCfg = Debug|Win32 {F0A15675-1017-4217-BB5B-3372F2C636AB}.Debug|Win32.Build.0 = Debug|Win32 - {F0A15675-1017-4217-BB5B-3372F2C636AB}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {F0A15675-1017-4217-BB5B-3372F2C636AB}.MinSizeRel|Win32.Build.0 = Release|Win32 + {F0A15675-1017-4217-BB5B-3372F2C636AB}.Debug|x64.ActiveCfg = Debug|x64 + {F0A15675-1017-4217-BB5B-3372F2C636AB}.Debug|x64.Build.0 = Debug|x64 {F0A15675-1017-4217-BB5B-3372F2C636AB}.Release|Win32.ActiveCfg = Release|Win32 {F0A15675-1017-4217-BB5B-3372F2C636AB}.Release|Win32.Build.0 = Release|Win32 - {F0A15675-1017-4217-BB5B-3372F2C636AB}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {F0A15675-1017-4217-BB5B-3372F2C636AB}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {F0A15675-1017-4217-BB5B-3372F2C636AB}.Release|x64.ActiveCfg = Release|x64 + {F0A15675-1017-4217-BB5B-3372F2C636AB}.Release|x64.Build.0 = Release|x64 {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.Debug|Win32.ActiveCfg = Debug|Win32 {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.Debug|Win32.Build.0 = Debug|Win32 - {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.MinSizeRel|Win32.ActiveCfg = Release|Win32 - {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.MinSizeRel|Win32.Build.0 = Release|Win32 + {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.Debug|x64.ActiveCfg = Debug|x64 + {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.Debug|x64.Build.0 = Debug|x64 {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.Release|Win32.ActiveCfg = Release|Win32 {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.Release|Win32.Build.0 = Release|Win32 - {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32 - {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.RelWithDebInfo|Win32.Build.0 = Release|Win32 + {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.Release|x64.ActiveCfg = Release|x64 + {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/VS2010/flatc.vcxproj b/build/VS2010/flatc.vcxproj index a3c58c4..f214254 100755 --- a/build/VS2010/flatc.vcxproj +++ b/build/VS2010/flatc.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {5B5857E1-64E2-4CED-A12E-45E1B3880496} @@ -22,11 +30,21 @@ false MultiByte + + Application + false + MultiByte + Application false MultiByte + + Application + false + MultiByte + @@ -37,17 +55,29 @@ <_ProjectFileVersion>10.0.20506.1 $(IntDir) + $(IntDir) flatc.dir\Debug\ + flatc.dir\Debug\ flatc + flatc .exe + .exe true + true true + true $(IntDir) + $(IntDir) flatc.dir\Release\ + flatc.dir\Release\ flatc + flatc .exe + .exe false + false true + true @@ -94,6 +124,51 @@ false + + + ../../include;%(AdditionalIncludeDirectories) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + Level3 + WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + Debug + $(IntDir) + ../../Debug/flatc.pdb + + + WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + ../../include;%(AdditionalIncludeDirectories) + + + ../../include;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /debug %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + true + ../../Debug/flatc.lib + ../../Debug/flatc.pdb + Console + + + + + false + + ../../include;%(AdditionalIncludeDirectories) @@ -139,6 +214,50 @@ false + + + ../../include;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + + + WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + Release + $(IntDir) + ../../Release/flatc.pdb + + + WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + ../../include;%(AdditionalIncludeDirectories) + + + ../../include;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + false + ../../Release/flatc.lib + ../../Release/flatc.pdb + Console + + + + + false + + @@ -149,11 +268,6 @@ - - - 71030BD1-9039-4724-A6C4-F7CB2C700B47 - - diff --git a/build/VS2010/flatc.vcxproj.user b/build/VS2010/flatc.vcxproj.user index 58f2fc2..f21324f 100755 --- a/build/VS2010/flatc.vcxproj.user +++ b/build/VS2010/flatc.vcxproj.user @@ -1,11 +1,26 @@  - ..\.. + ..\..\tests WindowsLocalDebugger + -j -c -b -t monster_test.fbs monsterdata_test.json ..\.. WindowsLocalDebugger + + -j -c -b -t monster_test.fbs monsterdata_test.json + + + ..\..\tests + WindowsLocalDebugger + + + -j -c -b -t monster_test.fbs monsterdata_test.json + + + ..\..\tests + WindowsLocalDebugger + \ No newline at end of file diff --git a/build/VS2010/flatsamplebinary.vcxproj b/build/VS2010/flatsamplebinary.vcxproj index e54ff87..9f34e7f 100755 --- a/build/VS2010/flatsamplebinary.vcxproj +++ b/build/VS2010/flatsamplebinary.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {16FA5518-3DE1-4B15-A1E0-F4734C276FB4} @@ -22,11 +30,21 @@ false MultiByte + + Application + false + MultiByte + Application false MultiByte + + Application + false + MultiByte + @@ -37,17 +55,29 @@ <_ProjectFileVersion>10.0.20506.1 $(IntDir) + $(IntDir) flatsamplebinary.dir\Debug\ + flatsamplebinary.dir\Debug\ flatsamplebinary + flatsamplebinary .exe + .exe true + true true + true $(IntDir) + $(IntDir) flatsamplebinary.dir\Release\ + flatsamplebinary.dir\Release\ flatsamplebinary + flatsamplebinary .exe + .exe false + false true + true @@ -94,6 +124,51 @@ false + + + ../../include;%(AdditionalIncludeDirectories) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + Level3 + WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + Debug + $(IntDir) + ../../Debug/flatsamplebinary.pdb + + + WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + ../../include;%(AdditionalIncludeDirectories) + + + ../../include;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /debug %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + true + ../../Debug/flatsamplebinary.lib + ../../Debug/flatsamplebinary.pdb + Console + + + + + false + + ../../include;%(AdditionalIncludeDirectories) @@ -139,16 +214,55 @@ false + + + ../../include;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + + + WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + Release + $(IntDir) + ../../Release/flatsamplebinary.pdb + + + WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + ../../include;%(AdditionalIncludeDirectories) + + + ../../include;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + false + ../../Release/flatsamplebinary.lib + ../../Release/flatsamplebinary.pdb + Console + + + + + false + + - - - 71030BD1-9039-4724-A6C4-F7CB2C700B47 - - diff --git a/build/VS2010/flatsamplebinary.vcxproj.user b/build/VS2010/flatsamplebinary.vcxproj.user index ace9a86..a23c447 100755 --- a/build/VS2010/flatsamplebinary.vcxproj.user +++ b/build/VS2010/flatsamplebinary.vcxproj.user @@ -1,3 +1,11 @@  + + ..\.. + WindowsLocalDebugger + + + ..\.. + WindowsLocalDebugger + \ No newline at end of file diff --git a/build/VS2010/flatsampletext.vcxproj b/build/VS2010/flatsampletext.vcxproj index 96d3d12..b66c8f6 100755 --- a/build/VS2010/flatsampletext.vcxproj +++ b/build/VS2010/flatsampletext.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {F0A15675-1017-4217-BB5B-3372F2C636AB} @@ -22,11 +30,21 @@ false MultiByte + + Application + false + MultiByte + Application false MultiByte + + Application + false + MultiByte + @@ -37,17 +55,29 @@ <_ProjectFileVersion>10.0.20506.1 $(IntDir) + $(IntDir) flatsampletext.dir\Debug\ + flatsampletext.dir\Debug\ flatsampletext + flatsampletext .exe + .exe true + true true + true $(IntDir) + $(IntDir) flatsampletext.dir\Release\ + flatsampletext.dir\Release\ flatsampletext + flatsampletext .exe + .exe false + false true + true @@ -94,6 +124,51 @@ false + + + ../../include;%(AdditionalIncludeDirectories) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + Level3 + WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + Debug + $(IntDir) + ../../Debug/flatsampletext.pdb + + + WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + ../../include;%(AdditionalIncludeDirectories) + + + ../../include;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /debug %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + true + ../../Debug/flatsampletext.lib + ../../Debug/flatsampletext.pdb + Console + + + + + false + + ../../include;%(AdditionalIncludeDirectories) @@ -139,6 +214,50 @@ false + + + ../../include;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + + + WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + Release + $(IntDir) + ../../Release/flatsampletext.pdb + + + WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + ../../include;%(AdditionalIncludeDirectories) + + + ../../include;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + false + ../../Release/flatsampletext.lib + ../../Release/flatsampletext.pdb + Console + + + + + false + + @@ -148,11 +267,6 @@ - - - 71030BD1-9039-4724-A6C4-F7CB2C700B47 - - diff --git a/build/VS2010/flatsampletext.vcxproj.user b/build/VS2010/flatsampletext.vcxproj.user index 58f2fc2..1753dbd 100755 --- a/build/VS2010/flatsampletext.vcxproj.user +++ b/build/VS2010/flatsampletext.vcxproj.user @@ -8,4 +8,12 @@ ..\.. WindowsLocalDebugger + + ..\.. + WindowsLocalDebugger + + + ..\.. + WindowsLocalDebugger + \ No newline at end of file diff --git a/build/VS2010/flattests.vcxproj b/build/VS2010/flattests.vcxproj index b6c253e..b6ccd61 100755 --- a/build/VS2010/flattests.vcxproj +++ b/build/VS2010/flattests.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {DC7BBA00-9FC6-48AF-B7E9-12CA91AC02AA} @@ -22,11 +30,21 @@ false MultiByte + + Application + false + MultiByte + Application false MultiByte + + Application + false + MultiByte + @@ -37,17 +55,29 @@ <_ProjectFileVersion>10.0.20506.1 $(IntDir) + $(IntDir) flattests.dir\Debug\ + flattests.dir\Debug\ flattests + flattests .exe + .exe true + true true + true $(IntDir) + $(IntDir) flattests.dir\Release\ + flattests.dir\Release\ flattests + flattests .exe + .exe false + false true + true @@ -94,6 +124,51 @@ false + + + ../../include;%(AdditionalIncludeDirectories) + EnableFastChecks + CompileAsCpp + ProgramDatabase + Sync + Disabled + Disabled + NotUsing + MultiThreadedDebugDLL + true + Level3 + WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + Debug + $(IntDir) + ../../Debug/flattests.pdb + + + WIN32;_WINDOWS;_DEBUG;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + ../../include;%(AdditionalIncludeDirectories) + + + ../../include;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + /debug %(AdditionalOptions) + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + true + ../../Debug/flattests.lib + ../../Debug/flattests.pdb + Console + + + + + false + + ../../include;%(AdditionalIncludeDirectories) @@ -139,6 +214,50 @@ false + + + ../../include;%(AdditionalIncludeDirectories) + CompileAsCpp + Sync + AnySuitable + MaxSpeed + NotUsing + MultiThreadedDLL + true + Level3 + + + WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + Release + $(IntDir) + ../../Release/flattests.pdb + + + WIN32;_WINDOWS;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + ../../include;%(AdditionalIncludeDirectories) + + + ../../include;%(AdditionalIncludeDirectories) + $(IntDir) + %(Filename).h + %(Filename).tlb + %(Filename)_i.c + %(Filename)_p.c + + + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + %(AdditionalLibraryDirectories) + false + ../../Release/flattests.lib + ../../Release/flattests.pdb + Console + + + + + false + + @@ -148,11 +267,6 @@ - - - 71030BD1-9039-4724-A6C4-F7CB2C700B47 - - diff --git a/build/VS2010/flattests.vcxproj.user b/build/VS2010/flattests.vcxproj.user index 58f2fc2..1753dbd 100755 --- a/build/VS2010/flattests.vcxproj.user +++ b/build/VS2010/flattests.vcxproj.user @@ -8,4 +8,12 @@ ..\.. WindowsLocalDebugger + + ..\.. + WindowsLocalDebugger + + + ..\.. + WindowsLocalDebugger + \ No newline at end of file -- 2.7.4