diff --git a/freeglut/freeglut/README.win32 b/freeglut/freeglut/README.win32 index 51d07a3..eca22db 100755 --- a/freeglut/freeglut/README.win32 +++ b/freeglut/freeglut/README.win32 @@ -27,13 +27,23 @@ following names: - Static, debug version: freeglut\freeglut\DebugStatic\freeglut_static.lib - Static, release version: freeglut\freeglut\ReleaseStatic\freeglut_static.lib -Starting with VS2008, these libraries can instead be found at: -- DLL, debug version: freeglut\freeglut\lib\Debug\freeglut.lib - freeglut\freeglut\lib\Debug\freeglut.dll -- DLL, release version: freeglut\freeglut\lib\Release\freeglut.lib - freeglut\freeglut\lib\Release\freeglut.dll -- Static, debug version: freeglut\freeglut\lib\Debug\freeglut_static.lib -- Static, release version: freeglut\freeglut\lib\Release\freeglut_static.lib +Starting with VS2008, both 32bit and 64bit builds are available. +These libraries can instead be found at: +32bit: +- DLL, debug version: freeglut\freeglut\lib\x86\Debug\freeglut.lib + freeglut\freeglut\lib\x86\Debug\freeglut.dll +- Static, debug version: freeglut\freeglut\lib\x86\Debug\freeglut_static.lib +- DLL, release version: freeglut\freeglut\lib\x86\freeglut.lib + freeglut\freeglut\lib\x86\freeglut.dll +- Static, release version: freeglut\freeglut\lib\x86\freeglut_static.lib + +64bit: +- DLL, debug version: freeglut\freeglut\lib\x64\Debug\freeglut.lib + freeglut\freeglut\lib\x64\Debug\freeglut.dll +- Static, debug version: freeglut\freeglut\lib\x64\Debug\freeglut_static.lib +- DLL, release version: freeglut\freeglut\lib\x64\freeglut.lib + freeglut\freeglut\lib\x64\freeglut.dll +- Static, release version: freeglut\freeglut\lib\x64\freeglut_static.lib Unlike the *nix release, the library names are NOT automatic replacements for the GLUT library names. You may rename them manually if you wish, but this is @@ -66,10 +76,6 @@ you will need to copy various files to various locations. "C:\Windows\System32" and will probably already have the files "opengl32.dll" and "glu32.dll". -The "VisualStudio2008" and "VisualStudio2008Static" directories are DEPRECATED -as of January 22, 2011. Users are directed to the "VisualStudio\2008" directory -instead. - Building and Installing the Libraries with Open Watcom ====================================================== diff --git a/freeglut/freeglut/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj b/freeglut/freeglut/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj index 41c1d3b..d462f70 100644 --- a/freeglut/freeglut/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj +++ b/freeglut/freeglut/VisualStudio/2008/CallbackMaker/CallbackMaker.vcproj @@ -12,14 +12,17 @@ + @@ -63,7 +66,7 @@ + + + + + + + + + + + + + + + + + + + @@ -137,7 +214,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63,7 +66,7 @@ + + + + + + + + + + + + + + + + + + + @@ -137,7 +214,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63,7 +66,7 @@ + + + + + + + + + + + + + + + + + + + @@ -137,7 +214,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63,7 +66,7 @@ + + + + + + + + + + + + + + + + + + + @@ -137,7 +214,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63,7 +66,7 @@ + + + + + + + + + + + + + + + + + + + @@ -137,7 +214,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63,7 +66,7 @@ + + + + + + + + + + + + + + + + + + + @@ -137,7 +214,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/freeglut/freeglut/VisualStudio/2008/freeglut.sln b/freeglut/freeglut/VisualStudio/2008/freeglut.sln index 8b405ab..c372d5e 100644 --- a/freeglut/freeglut/VisualStudio/2008/freeglut.sln +++ b/freeglut/freeglut/VisualStudio/2008/freeglut.sln @@ -51,91 +51,175 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_Static|Win32 = Debug_Static|Win32 + Debug_Static|x64 = Debug_Static|x64 Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release_Static|Win32 = Release_Static|Win32 + Release_Static|x64 = Release_Static|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug_Static|x64.Build.0 = Debug_Static|x64 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug|Win32.ActiveCfg = Debug|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug|Win32.Build.0 = Debug|Win32 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug|x64.ActiveCfg = Debug|x64 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug|x64.Build.0 = Debug|x64 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release_Static|x64.Build.0 = Release_Static|x64 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|Win32.ActiveCfg = Release|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|Win32.Build.0 = Release|Win32 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|x64.ActiveCfg = Release|x64 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|x64.Build.0 = Release|x64 {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug_Static|x64.Build.0 = Debug_Static|x64 {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug|Win32.ActiveCfg = Debug|Win32 {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug|Win32.Build.0 = Debug|Win32 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug|x64.ActiveCfg = Debug|x64 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug|x64.Build.0 = Debug|x64 {6383110F-E0DA-4604-A510-63A46FCB844B}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {6383110F-E0DA-4604-A510-63A46FCB844B}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Release_Static|x64.Build.0 = Release_Static|x64 {6383110F-E0DA-4604-A510-63A46FCB844B}.Release|Win32.ActiveCfg = Release|Win32 {6383110F-E0DA-4604-A510-63A46FCB844B}.Release|Win32.Build.0 = Release|Win32 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Release|x64.ActiveCfg = Release|x64 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Release|x64.Build.0 = Release|x64 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug_Static|x64.Build.0 = Debug_Static|x64 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug|Win32.ActiveCfg = Debug|Win32 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug|Win32.Build.0 = Debug|Win32 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug|x64.ActiveCfg = Debug|x64 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug|x64.Build.0 = Debug|x64 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release_Static|x64.Build.0 = Release_Static|x64 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release|Win32.ActiveCfg = Release|Win32 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release|Win32.Build.0 = Release|Win32 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release|x64.ActiveCfg = Release|x64 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release|x64.Build.0 = Release|x64 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug_Static|x64.Build.0 = Debug_Static|x64 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug|Win32.ActiveCfg = Debug|Win32 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug|Win32.Build.0 = Debug|Win32 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug|x64.ActiveCfg = Debug|x64 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug|x64.Build.0 = Debug|x64 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release_Static|x64.Build.0 = Release_Static|x64 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release|Win32.ActiveCfg = Release|Win32 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release|Win32.Build.0 = Release|Win32 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release|x64.ActiveCfg = Release|x64 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release|x64.Build.0 = Release|x64 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug_Static|x64.Build.0 = Debug_Static|x64 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug|Win32.ActiveCfg = Debug|Win32 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug|Win32.Build.0 = Debug|Win32 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug|x64.ActiveCfg = Debug|x64 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug|x64.Build.0 = Debug|x64 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release_Static|x64.Build.0 = Release_Static|x64 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release|Win32.ActiveCfg = Release|Win32 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release|Win32.Build.0 = Release|Win32 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release|x64.ActiveCfg = Release|x64 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release|x64.Build.0 = Release|x64 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug_Static|x64.Build.0 = Debug_Static|x64 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug|Win32.ActiveCfg = Debug|Win32 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug|Win32.Build.0 = Debug|Win32 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug|x64.ActiveCfg = Debug|x64 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug|x64.Build.0 = Debug|x64 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release_Static|x64.Build.0 = Release_Static|x64 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release|Win32.ActiveCfg = Release|Win32 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release|Win32.Build.0 = Release|Win32 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release|x64.ActiveCfg = Release|x64 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release|x64.Build.0 = Release|x64 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug_Static|x64.Build.0 = Debug_Static|x64 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug|Win32.ActiveCfg = Debug|Win32 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug|Win32.Build.0 = Debug|Win32 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug|x64.ActiveCfg = Debug|x64 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug|x64.Build.0 = Debug|x64 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release_Static|x64.Build.0 = Release_Static|x64 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release|Win32.ActiveCfg = Release|Win32 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release|Win32.Build.0 = Release|Win32 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release|x64.ActiveCfg = Release|x64 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release|x64.Build.0 = Release|x64 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug_Static|x64.Build.0 = Debug_Static|x64 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug|Win32.ActiveCfg = Debug|Win32 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug|Win32.Build.0 = Debug|Win32 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug|x64.ActiveCfg = Debug|x64 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug|x64.Build.0 = Debug|x64 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release_Static|x64.Build.0 = Release_Static|x64 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release|Win32.ActiveCfg = Release|Win32 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release|Win32.Build.0 = Release|Win32 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release|x64.ActiveCfg = Release|x64 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release|x64.Build.0 = Release|x64 {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|x64.Build.0 = Debug_Static|x64 {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|Win32.ActiveCfg = Debug|Win32 {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|Win32.Build.0 = Debug|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|x64.ActiveCfg = Debug|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|x64.Build.0 = Debug|x64 {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|x64.Build.0 = Release_Static|x64 {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release|Win32.ActiveCfg = Release|Win32 {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release|Win32.Build.0 = Release|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release|x64.ActiveCfg = Release|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release|x64.Build.0 = Release|x64 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug_Static|x64.Build.0 = Debug_Static|x64 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug|Win32.ActiveCfg = Debug|Win32 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug|Win32.Build.0 = Debug|Win32 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug|x64.ActiveCfg = Debug|x64 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug|x64.Build.0 = Debug|x64 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release_Static|x64.Build.0 = Release_Static|x64 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release|Win32.ActiveCfg = Release|Win32 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release|Win32.Build.0 = Release|Win32 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release|x64.ActiveCfg = Release|x64 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/freeglut/freeglut/VisualStudio/2008/freeglut.vcproj b/freeglut/freeglut/VisualStudio/2008/freeglut.vcproj index b62c1b1..733bcdd 100644 --- a/freeglut/freeglut/VisualStudio/2008/freeglut.vcproj +++ b/freeglut/freeglut/VisualStudio/2008/freeglut.vcproj @@ -11,14 +11,17 @@ + @@ -93,13 +95,90 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -242,13 +386,157 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/freeglut/freeglut/VisualStudio/2008/shapes/shapes.vcproj b/freeglut/freeglut/VisualStudio/2008/shapes/shapes.vcproj index d7fec73..f29c2f3 100644 --- a/freeglut/freeglut/VisualStudio/2008/shapes/shapes.vcproj +++ b/freeglut/freeglut/VisualStudio/2008/shapes/shapes.vcproj @@ -12,14 +12,17 @@ + @@ -63,7 +66,7 @@ + + + + + + + + + + + + + + + + + + + @@ -137,7 +214,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63,7 +66,7 @@ + + + + + + + + + + + + + + + + + + + @@ -137,7 +214,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63,7 +66,7 @@ + + + + + + + + + + + + + + + + + + + @@ -137,7 +214,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {6383110F-E0DA-4604-A510-63A46FCB844B} @@ -29,49 +45,91 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + ..\..\..\progs\demos\x86\debug_dll\ + ..\..\..\progs\demos\x64\debug_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\debug_static\ + ..\..\..\progs\demos\x64\debug_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\release_dll\ + ..\..\..\progs\demos\x64\release_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + false + ..\..\..\progs\demos\x86\release_static\ + ..\..\..\progs\demos\x64\release_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false + false @@ -84,15 +142,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + Disabled @@ -104,15 +180,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + MaxSpeed @@ -123,16 +217,35 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + MaxSpeed @@ -143,25 +256,38 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + - - - {1ae4e979-0d35-4747-bf8e-dd60358f49db} - false - - diff --git a/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj b/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj index 9533438..b2ad7d7 100644 --- a/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj +++ b/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj @@ -5,18 +5,34 @@ Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2} @@ -29,49 +45,91 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + ..\..\..\progs\demos\x86\debug_dll\ + ..\..\..\progs\demos\x64\debug_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\debug_static\ + ..\..\..\progs\demos\x64\debug_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\release_dll\ + ..\..\..\progs\demos\x64\release_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + false + ..\..\..\progs\demos\x86\release_static\ + ..\..\..\progs\demos\x64\release_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false + false @@ -84,15 +142,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + Disabled @@ -104,15 +180,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + MaxSpeed @@ -123,16 +217,35 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + MaxSpeed @@ -143,25 +256,38 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + - - - {1ae4e979-0d35-4747-bf8e-dd60358f49db} - false - - diff --git a/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj.filters b/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj.filters index 6afa389..e887e7e 100644 --- a/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj.filters +++ b/freeglut/freeglut/VisualStudio/2010/Fractals/Fractals.vcxproj.filters @@ -1,16 +1,16 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + + {8198a957-93eb-490e-bfd2-cd203d8c4353} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} + + {e2776b56-b2a7-49f1-8f1a-6807c602be87} h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + {abc27e06-8ad9-4f23-bbdd-92c542ce2f3b} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav @@ -19,4 +19,4 @@ Source Files - \ No newline at end of file + diff --git a/freeglut/freeglut/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj b/freeglut/freeglut/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj index 6be01a5..dd41c93 100644 --- a/freeglut/freeglut/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj +++ b/freeglut/freeglut/VisualStudio/2010/Fractals_random/Fractals_random.vcxproj @@ -5,18 +5,34 @@ Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23} @@ -29,49 +45,91 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + ..\..\..\progs\demos\x86\debug_dll\ + ..\..\..\progs\demos\x64\debug_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\debug_static\ + ..\..\..\progs\demos\x64\debug_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\release_dll\ + ..\..\..\progs\demos\x64\release_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + false + ..\..\..\progs\demos\x86\release_static\ + ..\..\..\progs\demos\x64\release_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false + false @@ -84,15 +142,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + Disabled @@ -104,15 +180,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + MaxSpeed @@ -123,16 +217,35 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + MaxSpeed @@ -143,25 +256,38 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + - - - {1ae4e979-0d35-4747-bf8e-dd60358f49db} - false - - diff --git a/freeglut/freeglut/VisualStudio/2010/Lorenz/Lorenz.vcxproj b/freeglut/freeglut/VisualStudio/2010/Lorenz/Lorenz.vcxproj index 8a6cc68..39c85da 100644 --- a/freeglut/freeglut/VisualStudio/2010/Lorenz/Lorenz.vcxproj +++ b/freeglut/freeglut/VisualStudio/2010/Lorenz/Lorenz.vcxproj @@ -5,18 +5,34 @@ Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {6805E1E3-F437-4621-AA68-0778BDEE51EF} @@ -29,49 +45,91 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + ..\..\..\progs\demos\x86\debug_dll\ + ..\..\..\progs\demos\x64\debug_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\debug_static\ + ..\..\..\progs\demos\x64\debug_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\release_dll\ + ..\..\..\progs\demos\x64\release_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + false + ..\..\..\progs\demos\x86\release_static\ + ..\..\..\progs\demos\x64\release_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false + false @@ -84,15 +142,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + Disabled @@ -104,15 +180,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + MaxSpeed @@ -123,16 +217,35 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + MaxSpeed @@ -143,25 +256,38 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + - - - {1ae4e979-0d35-4747-bf8e-dd60358f49db} - false - - diff --git a/freeglut/freeglut/VisualStudio/2010/One/One.vcxproj b/freeglut/freeglut/VisualStudio/2010/One/One.vcxproj index a7c45f1..0fcc0e8 100644 --- a/freeglut/freeglut/VisualStudio/2010/One/One.vcxproj +++ b/freeglut/freeglut/VisualStudio/2010/One/One.vcxproj @@ -5,18 +5,34 @@ Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036} @@ -29,49 +45,91 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + ..\..\..\progs\demos\x86\debug_dll\ + ..\..\..\progs\demos\x64\debug_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\debug_static\ + ..\..\..\progs\demos\x64\debug_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\release_dll\ + ..\..\..\progs\demos\x64\release_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + false + ..\..\..\progs\demos\x86\release_static\ + ..\..\..\progs\demos\x64\release_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false + false @@ -84,15 +142,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + Disabled @@ -104,15 +180,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + MaxSpeed @@ -123,16 +217,35 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + MaxSpeed @@ -143,25 +256,38 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + - - - {1ae4e979-0d35-4747-bf8e-dd60358f49db} - false - - diff --git a/freeglut/freeglut/VisualStudio/2010/Resizer/Resizer.vcxproj b/freeglut/freeglut/VisualStudio/2010/Resizer/Resizer.vcxproj index 68d7f6c..991ecd2 100644 --- a/freeglut/freeglut/VisualStudio/2010/Resizer/Resizer.vcxproj +++ b/freeglut/freeglut/VisualStudio/2010/Resizer/Resizer.vcxproj @@ -5,18 +5,34 @@ Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E} @@ -29,49 +45,91 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + ..\..\..\progs\demos\x86\debug_dll\ + ..\..\..\progs\demos\x64\debug_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\debug_static\ + ..\..\..\progs\demos\x64\debug_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\release_dll\ + ..\..\..\progs\demos\x64\release_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + false + ..\..\..\progs\demos\x86\release_static\ + ..\..\..\progs\demos\x64\release_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false + false @@ -87,12 +145,30 @@ 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + Disabled @@ -107,12 +183,30 @@ 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + MaxSpeed @@ -126,13 +220,32 @@ 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + MaxSpeed @@ -146,13 +259,32 @@ 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + diff --git a/freeglut/freeglut/VisualStudio/2010/freeglut.sln b/freeglut/freeglut/VisualStudio/2010/freeglut.sln index 9ee452a..8044610 100644 --- a/freeglut/freeglut/VisualStudio/2010/freeglut.sln +++ b/freeglut/freeglut/VisualStudio/2010/freeglut.sln @@ -4,111 +4,222 @@ Microsoft Visual Studio Solution File, Format Version 11.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freeglut", "freeglut.vcxproj", "{1AE4E979-0D35-4747-BF8E-DD60358F49DB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CallbackMaker", "CallbackMaker\CallbackMaker.vcxproj", "{6383110F-E0DA-4604-A510-63A46FCB844B}" + ProjectSection(ProjectDependencies) = postProject + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} = {1AE4E979-0D35-4747-BF8E-DD60358F49DB} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fractals", "Fractals\Fractals.vcxproj", "{289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}" + ProjectSection(ProjectDependencies) = postProject + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} = {1AE4E979-0D35-4747-BF8E-DD60358F49DB} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fractals_random", "Fractals_random\Fractals_random.vcxproj", "{0D61E7A8-BF10-4C13-B5F4-971851C89E23}" + ProjectSection(ProjectDependencies) = postProject + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} = {1AE4E979-0D35-4747-BF8E-DD60358F49DB} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lorenz", "Lorenz\Lorenz.vcxproj", "{6805E1E3-F437-4621-AA68-0778BDEE51EF}" + ProjectSection(ProjectDependencies) = postProject + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} = {1AE4E979-0D35-4747-BF8E-DD60358F49DB} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "One", "One\One.vcxproj", "{6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}" + ProjectSection(ProjectDependencies) = postProject + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} = {1AE4E979-0D35-4747-BF8E-DD60358F49DB} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapes", "shapes\shapes.vcxproj", "{9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}" + ProjectSection(ProjectDependencies) = postProject + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} = {1AE4E979-0D35-4747-BF8E-DD60358F49DB} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smooth_opengl3", "smooth_opengl3\smooth_opengl3.vcxproj", "{BEA6A000-DB05-4410-9863-42AAAD57AA1E}" + ProjectSection(ProjectDependencies) = postProject + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} = {1AE4E979-0D35-4747-BF8E-DD60358F49DB} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subwin", "subwin\subwin.vcxproj", "{CD3C35E0-FED3-4425-8CF9-A772667D464B}" + ProjectSection(ProjectDependencies) = postProject + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} = {1AE4E979-0D35-4747-BF8E-DD60358F49DB} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subwin", "subwin\subwin.vcxproj", "{CD3C35E0-FED3-4425-8CF9-A772667D464B}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Resizer", "Resizer\Resizer.vcxproj", "{8034DA32-26FB-46FC-A47B-2E3EAD39B34E}" + ProjectSection(ProjectDependencies) = postProject + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} = {1AE4E979-0D35-4747-BF8E-DD60358F49DB} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_Static|Win32 = Debug_Static|Win32 + Debug_Static|x64 = Debug_Static|x64 Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release_Static|Win32 = Release_Static|Win32 + Release_Static|x64 = Release_Static|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug_Static|x64.Build.0 = Debug_Static|x64 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug|Win32.ActiveCfg = Debug|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug|Win32.Build.0 = Debug|Win32 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug|x64.ActiveCfg = Debug|x64 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug|x64.Build.0 = Debug|x64 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release_Static|x64.Build.0 = Release_Static|x64 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|Win32.ActiveCfg = Release|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|Win32.Build.0 = Release|Win32 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|x64.ActiveCfg = Release|x64 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|x64.Build.0 = Release|x64 {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug_Static|x64.Build.0 = Debug_Static|x64 {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug|Win32.ActiveCfg = Debug|Win32 {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug|Win32.Build.0 = Debug|Win32 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug|x64.ActiveCfg = Debug|x64 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Debug|x64.Build.0 = Debug|x64 {6383110F-E0DA-4604-A510-63A46FCB844B}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {6383110F-E0DA-4604-A510-63A46FCB844B}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Release_Static|x64.Build.0 = Release_Static|x64 {6383110F-E0DA-4604-A510-63A46FCB844B}.Release|Win32.ActiveCfg = Release|Win32 {6383110F-E0DA-4604-A510-63A46FCB844B}.Release|Win32.Build.0 = Release|Win32 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Release|x64.ActiveCfg = Release|x64 + {6383110F-E0DA-4604-A510-63A46FCB844B}.Release|x64.Build.0 = Release|x64 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug_Static|x64.Build.0 = Debug_Static|x64 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug|Win32.ActiveCfg = Debug|Win32 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug|Win32.Build.0 = Debug|Win32 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug|x64.ActiveCfg = Debug|x64 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Debug|x64.Build.0 = Debug|x64 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release_Static|x64.Build.0 = Release_Static|x64 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release|Win32.ActiveCfg = Release|Win32 {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release|Win32.Build.0 = Release|Win32 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release|x64.ActiveCfg = Release|x64 + {289436C6-B6B4-40AD-8D0E-8B3BFB7075E2}.Release|x64.Build.0 = Release|x64 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug_Static|x64.Build.0 = Debug_Static|x64 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug|Win32.ActiveCfg = Debug|Win32 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug|Win32.Build.0 = Debug|Win32 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug|x64.ActiveCfg = Debug|x64 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Debug|x64.Build.0 = Debug|x64 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release_Static|x64.Build.0 = Release_Static|x64 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release|Win32.ActiveCfg = Release|Win32 {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release|Win32.Build.0 = Release|Win32 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release|x64.ActiveCfg = Release|x64 + {0D61E7A8-BF10-4C13-B5F4-971851C89E23}.Release|x64.Build.0 = Release|x64 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug_Static|x64.Build.0 = Debug_Static|x64 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug|Win32.ActiveCfg = Debug|Win32 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug|Win32.Build.0 = Debug|Win32 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug|x64.ActiveCfg = Debug|x64 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Debug|x64.Build.0 = Debug|x64 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release_Static|x64.Build.0 = Release_Static|x64 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release|Win32.ActiveCfg = Release|Win32 {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release|Win32.Build.0 = Release|Win32 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release|x64.ActiveCfg = Release|x64 + {6805E1E3-F437-4621-AA68-0778BDEE51EF}.Release|x64.Build.0 = Release|x64 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug_Static|x64.Build.0 = Debug_Static|x64 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug|Win32.ActiveCfg = Debug|Win32 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug|Win32.Build.0 = Debug|Win32 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug|x64.ActiveCfg = Debug|x64 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Debug|x64.Build.0 = Debug|x64 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release_Static|x64.Build.0 = Release_Static|x64 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release|Win32.ActiveCfg = Release|Win32 {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release|Win32.Build.0 = Release|Win32 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release|x64.ActiveCfg = Release|x64 + {6B5B08E3-B24F-4A22-83AC-EF07A9B6C036}.Release|x64.Build.0 = Release|x64 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug_Static|x64.Build.0 = Debug_Static|x64 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug|Win32.ActiveCfg = Debug|Win32 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug|Win32.Build.0 = Debug|Win32 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug|x64.ActiveCfg = Debug|x64 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Debug|x64.Build.0 = Debug|x64 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release_Static|x64.Build.0 = Release_Static|x64 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release|Win32.ActiveCfg = Release|Win32 {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release|Win32.Build.0 = Release|Win32 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release|x64.ActiveCfg = Release|x64 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18}.Release|x64.Build.0 = Release|x64 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug_Static|x64.Build.0 = Debug_Static|x64 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug|Win32.ActiveCfg = Debug|Win32 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug|Win32.Build.0 = Debug|Win32 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug|x64.ActiveCfg = Debug|x64 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Debug|x64.Build.0 = Debug|x64 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release_Static|x64.Build.0 = Release_Static|x64 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release|Win32.ActiveCfg = Release|Win32 {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release|Win32.Build.0 = Release|Win32 - {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 - {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 - {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|Win32.Build.0 = Debug|Win32 - {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 - {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|Win32.Build.0 = Release_Static|Win32 - {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release|Win32.ActiveCfg = Release|Win32 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release|x64.ActiveCfg = Release|x64 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E}.Release|x64.Build.0 = Release|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug_Static|x64.Build.0 = Debug_Static|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|Win32.Build.0 = Debug|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|x64.ActiveCfg = Debug|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Debug|x64.Build.0 = Debug|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release_Static|x64.Build.0 = Release_Static|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release|Win32.ActiveCfg = Release|Win32 {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release|Win32.Build.0 = Release|Win32 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release|x64.ActiveCfg = Release|x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B}.Release|x64.Build.0 = Release|x64 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug_Static|Win32.ActiveCfg = Debug_Static|Win32 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug_Static|Win32.Build.0 = Debug_Static|Win32 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug_Static|x64.ActiveCfg = Debug_Static|x64 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug_Static|x64.Build.0 = Debug_Static|x64 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug|Win32.ActiveCfg = Debug|Win32 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug|Win32.Build.0 = Debug|Win32 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug|x64.ActiveCfg = Debug|x64 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Debug|x64.Build.0 = Debug|x64 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release_Static|Win32.Build.0 = Release_Static|Win32 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release_Static|x64.ActiveCfg = Release_Static|x64 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release_Static|x64.Build.0 = Release_Static|x64 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release|Win32.ActiveCfg = Release|Win32 {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release|Win32.Build.0 = Release|Win32 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release|x64.ActiveCfg = Release|x64 + {8034DA32-26FB-46FC-A47B-2E3EAD39B34E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj b/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj index 6729bf3..3684b1c 100644 --- a/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj +++ b/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj @@ -5,18 +5,34 @@ Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {1AE4E979-0D35-4747-BF8E-DD60358F49DB} @@ -29,52 +45,98 @@ MultiByte true + + StaticLibrary + false + MultiByte + true + DynamicLibrary false MultiByte true + + DynamicLibrary + false + MultiByte + true + StaticLibrary false MultiByte + + StaticLibrary + false + MultiByte + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - build\$(Configuration)\ + ..\..\lib\x86\Debug\ + ..\..\lib\x64\Debug\ + build\$(Configuration)\$(PlatformName)_$(PlatformToolset)\ + build\$(Configuration)\$(PlatformName)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - build\$(Configuration)\ - $(SolutionDir)build\$(Configuration)\ - build\$(Configuration)\ + true + ..\..\lib\x86\Debug\ + ..\..\lib\x64\Debug\ + build\$(Configuration)\$(PlatformName)_$(PlatformToolset)\ + build\$(Configuration)\$(PlatformName)_$(PlatformToolset)\ + ..\..\lib\x86\ + ..\..\lib\x64\ + build\$(Configuration)\$(PlatformName)_$(PlatformToolset)\ + build\$(Configuration)\$(PlatformName)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - build\$(Configuration)\ + false + ..\..\lib\x86\ + ..\..\lib\x64\ + build\$(Configuration)\$(PlatformName)_$(PlatformToolset)\ + build\$(Configuration)\$(PlatformName)_$(PlatformToolset)\ $(ProjectName)_static + $(ProjectName)_static $(ProjectName)_static + $(ProjectName)_static @@ -87,25 +149,43 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) 0x0409 - $(OutDir)$(ProjectName).dll - ..\..\src\freeglutdll.def true false - $(OutDir)$(ProjectName).lib MachineX86 + ..\..\src\freeglutdll.def + + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + false + + - - for %%I in ($(TargetDir)\$(TargetName)$(TargetExt) $(TargetDir)\$(TargetName).lib $(TargetDir)\$(TargetName).exp) do xcopy /F /Y %%I ..\..\lib\Debug\ - @@ -118,74 +198,127 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) 0x0409 - $(OutDir)$(TargetName).lib MachineX86 - - xcopy /F /Y $(TargetDir)\$(TargetName)$(TargetExt) ..\..\lib\Debug\ - + + + + Disabled + ..\..\include;%(AdditionalIncludeDirectories) + _DEBUG;FREEGLUT_STATIC;WIN32;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + MachineX64 + MaxSpeed + AnySuitable true ..\..\include;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL true Level3 - AnySuitable CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) 0x0409 - $(OutDir)$(ProjectName).dll - ..\..\src\freeglutdll.def false - $(OutDir)$(ProjectName).lib MachineX86 + ..\..\src\freeglutdll.def + + + + + MaxSpeed + AnySuitable + true + ..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;_USRDLL;FREEGLUT_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + false + + - - for %%I in ($(TargetDir)\$(TargetName)$(TargetExt) $(TargetDir)\$(TargetName).lib $(TargetDir)\$(TargetName).exp) do xcopy /F /Y %%I ..\..\lib\Release\ - MaxSpeed AnySuitable + true ..\..\include;%(AdditionalIncludeDirectories) NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;%(PreprocessorDefinitions) MultiThreaded true Level3 - true CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) 0x0409 - $(OutDir)$(TargetName).lib MachineX86 - - xcopy /F /Y $(TargetDir)\$(TargetName)$(TargetExt) ..\..\lib\Release\ - + + + + MaxSpeed + AnySuitable + true + ..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;FREEGLUT_STATIC;WIN32;_LIB;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + MachineX64 + diff --git a/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj.filters b/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj.filters index cf558f3..2b28b86 100644 --- a/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj.filters +++ b/freeglut/freeglut/VisualStudio/2010/freeglut.vcxproj.filters @@ -2,15 +2,15 @@ - {6b55b52c-3b87-42a7-8679-66a91136f452} + {6eece484-e981-49f2-8b4a-709efc3c99ac} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {7ae758d5-8151-47b8-a348-d1d819d812ca} + {3fde4ff9-d2ce-44a9-bb91-82ac1e82c843} h;hpp;hxx;hm;inl - {348c3d14-bb7e-481f-836f-8a31a3702733} + {6d047688-5630-43f9-885d-d6aa0aba3773} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe diff --git a/freeglut/freeglut/VisualStudio/2010/shapes/shapes.vcxproj b/freeglut/freeglut/VisualStudio/2010/shapes/shapes.vcxproj index 13420fa..304d17c 100644 --- a/freeglut/freeglut/VisualStudio/2010/shapes/shapes.vcxproj +++ b/freeglut/freeglut/VisualStudio/2010/shapes/shapes.vcxproj @@ -5,18 +5,34 @@ Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {9CF59EE9-AEE3-46FB-8026-DF1DDA75DF18} @@ -29,49 +45,91 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + ..\..\..\progs\demos\x86\debug_dll\ + ..\..\..\progs\demos\x64\debug_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\debug_static\ + ..\..\..\progs\demos\x64\debug_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\release_dll\ + ..\..\..\progs\demos\x64\release_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + false + ..\..\..\progs\demos\x86\release_static\ + ..\..\..\progs\demos\x64\release_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false + false @@ -84,15 +142,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + Disabled @@ -104,15 +180,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + MaxSpeed @@ -123,16 +217,35 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + MaxSpeed @@ -143,25 +256,38 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + - - - {1ae4e979-0d35-4747-bf8e-dd60358f49db} - false - - diff --git a/freeglut/freeglut/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj b/freeglut/freeglut/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj index 90398cb..c115c2e 100644 --- a/freeglut/freeglut/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj +++ b/freeglut/freeglut/VisualStudio/2010/smooth_opengl3/smooth_opengl3.vcxproj @@ -5,18 +5,34 @@ Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {BEA6A000-DB05-4410-9863-42AAAD57AA1E} @@ -29,49 +45,91 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + ..\..\..\progs\demos\x86\debug_dll\ + ..\..\..\progs\demos\x64\debug_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\debug_static\ + ..\..\..\progs\demos\x64\debug_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\release_dll\ + ..\..\..\progs\demos\x64\release_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + false + ..\..\..\progs\demos\x86\release_static\ + ..\..\..\progs\demos\x64\release_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false + false @@ -84,15 +142,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + Disabled @@ -104,15 +180,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + MaxSpeed @@ -123,16 +217,35 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + MaxSpeed @@ -143,25 +256,38 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + - - - {1ae4e979-0d35-4747-bf8e-dd60358f49db} - false - - diff --git a/freeglut/freeglut/VisualStudio/2010/subwin/subwin.vcxproj b/freeglut/freeglut/VisualStudio/2010/subwin/subwin.vcxproj index c7a96cf..db8c81b 100644 --- a/freeglut/freeglut/VisualStudio/2010/subwin/subwin.vcxproj +++ b/freeglut/freeglut/VisualStudio/2010/subwin/subwin.vcxproj @@ -5,18 +5,34 @@ Debug_Static Win32 + + Debug_Static + x64 + Debug Win32 + + Debug + x64 + Release_Static Win32 + + Release_Static + x64 + Release Win32 + + Release + x64 + {CD3C35E0-FED3-4425-8CF9-A772667D464B} @@ -29,49 +45,91 @@ Unicode true + + Application + Unicode + true + Application Unicode true + + Application + Unicode + true + Application Unicode + + Application + Unicode + Application Unicode + + Application + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + ..\..\..\progs\demos\x86\debug_dll\ + ..\..\..\progs\demos\x64\debug_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\debug_static\ + ..\..\..\progs\demos\x64\debug_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ true - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + true + ..\..\..\progs\demos\x86\release_dll\ + ..\..\..\progs\demos\x64\release_dll\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false - $(SolutionDir)build\$(Configuration)\ - $(Configuration)\ + false + ..\..\..\progs\demos\x86\release_static\ + ..\..\..\progs\demos\x64\release_static\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ + $(Configuration)\$(Platform)_$(PlatformToolset)\ false + false @@ -84,15 +142,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + Disabled @@ -104,15 +180,33 @@ Level3 EditAndContinue CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Debug;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\debug\;%(AdditionalLibraryDirectories) true Console MachineX86 + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\debug\;%(AdditionalLibraryDirectories) + true + Console + + MaxSpeed @@ -123,16 +217,35 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + MaxSpeed @@ -143,25 +256,38 @@ true Level3 CompileAsC - 4996 + 4996;%(DisableSpecificWarnings) - ..\..\..\lib\Release;%(AdditionalLibraryDirectories) + ..\..\..\lib\x86\;%(AdditionalLibraryDirectories) Console true true MachineX86 + + + MaxSpeed + true + ..\..\..\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FREEGLUT_STATIC;%(PreprocessorDefinitions) + MultiThreaded + true + Level3 + CompileAsC + 4996;%(DisableSpecificWarnings) + + + ..\..\..\lib\x64\;%(AdditionalLibraryDirectories) + Console + true + true + + - - - {1ae4e979-0d35-4747-bf8e-dd60358f49db} - false - -