From ad2f613a10c46017d9f391ebcfa048c6d13718c8 Mon Sep 17 00:00:00 2001 From: spanne Date: Sat, 23 May 2009 12:50:37 +0000 Subject: [PATCH] Put static library stuff into its own solution. This way, a rather uncommon way doesn't clutter up our normal solution, which is DLL-based. git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@823 7f0cb862-5218-0410-a997-914c9d46530a --- .gitattributes | 1 + .gitignore | 6 ++++-- freeglut/freeglut/freeglut_vs2008.sln | 8 +------- freeglut/freeglut/freeglut_vs2008_static.sln | 20 ++++++++++++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 freeglut/freeglut/freeglut_vs2008_static.sln diff --git a/.gitattributes b/.gitattributes index 6cb55f0..97be754 100644 --- a/.gitattributes +++ b/.gitattributes @@ -40,6 +40,7 @@ freeglut/freeglut/freeglut_static.tgt svn_keywords=Author+Date+Id+Revision freeglut/freeglut/freeglut_static_vs2008.vcproj -text freeglut/freeglut/freeglut_vs2008.sln -text freeglut/freeglut/freeglut_vs2008.vcproj -text +freeglut/freeglut/freeglut_vs2008_static.sln -text freeglut/freeglut/include/GL/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/include/GL/freeglut.h svn_keywords=Author+Date+Id+Revision freeglut/freeglut/include/GL/freeglut_ext.h svn_keywords=Author+Date+Id+Revision diff --git a/.gitignore b/.gitignore index bc648fa..d6c4f12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,12 @@ +freeglut/freeglut/*.ncb +freeglut/freeglut/*.suo freeglut/freeglut/Debug +freeglut/freeglut/DebugStatic freeglut/freeglut/INSTALL freeglut/freeglut/Makefile freeglut/freeglut/Makefile.in freeglut/freeglut/Release +freeglut/freeglut/ReleaseStatic freeglut/freeglut/aclocal.m4 freeglut/freeglut/autom4te.cache freeglut/freeglut/autoscan.log @@ -23,8 +27,6 @@ freeglut/freeglut/doc/Makefile freeglut/freeglut/doc/Makefile.in freeglut/freeglut/freeglut-*.tar.gz freeglut/freeglut/freeglut_static_vs2008.vcproj.*.user -freeglut/freeglut/freeglut_vs2008.ncb -freeglut/freeglut/freeglut_vs2008.suo freeglut/freeglut/freeglut_vs2008.vcproj.*.user freeglut/freeglut/include/GL/Makefile freeglut/freeglut/include/GL/Makefile.in diff --git a/freeglut/freeglut/freeglut_vs2008.sln b/freeglut/freeglut/freeglut_vs2008.sln index dd92782..fe066f9 100644 --- a/freeglut/freeglut/freeglut_vs2008.sln +++ b/freeglut/freeglut/freeglut_vs2008.sln @@ -1,10 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +# Visual C++ Express 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freeglut", "freeglut_vs2008.vcproj", "{1AE4E979-0D35-4747-BF8E-DD60358F49DB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freeglut_static", "freeglut_static_vs2008.vcproj", "{71AF75A0-52B6-4C1B-8E56-CB31C6741A18}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -15,10 +13,6 @@ Global {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Debug|Win32.Build.0 = Debug|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|Win32.ActiveCfg = Release|Win32 {1AE4E979-0D35-4747-BF8E-DD60358F49DB}.Release|Win32.Build.0 = Release|Win32 - {71AF75A0-52B6-4C1B-8E56-CB31C6741A18}.Debug|Win32.ActiveCfg = Debug|Win32 - {71AF75A0-52B6-4C1B-8E56-CB31C6741A18}.Debug|Win32.Build.0 = Debug|Win32 - {71AF75A0-52B6-4C1B-8E56-CB31C6741A18}.Release|Win32.ActiveCfg = Release|Win32 - {71AF75A0-52B6-4C1B-8E56-CB31C6741A18}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/freeglut/freeglut/freeglut_vs2008_static.sln b/freeglut/freeglut/freeglut_vs2008_static.sln new file mode 100644 index 0000000..1c1754a --- /dev/null +++ b/freeglut/freeglut/freeglut_vs2008_static.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freeglut_static", "freeglut_static_vs2008.vcproj", "{71AF75A0-52B6-4C1B-8E56-CB31C6741A18}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {71AF75A0-52B6-4C1B-8E56-CB31C6741A18}.Debug|Win32.ActiveCfg = Debug|Win32 + {71AF75A0-52B6-4C1B-8E56-CB31C6741A18}.Debug|Win32.Build.0 = Debug|Win32 + {71AF75A0-52B6-4C1B-8E56-CB31C6741A18}.Release|Win32.ActiveCfg = Release|Win32 + {71AF75A0-52B6-4C1B-8E56-CB31C6741A18}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal