From 70f7d18b1bebd080378213e0c84a3c8e9da51842 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 16 Mar 2014 11:40:49 -0400 Subject: [PATCH 1/4] Move PCRE to separate project (2011) --- extern/pcre/libpcre-net2011.vcxproj | 94 +++++++++++++++++++++ extern/pcre/libpcre-net2011.vcxproj.filters | 14 +++ src/StepMania-net2011.vcxproj | 55 +----------- src/StepMania-net2011.vcxproj.filters | 26 +----- src/sm5-net2011.sln | 10 +++ 5 files changed, 122 insertions(+), 77 deletions(-) create mode 100644 extern/pcre/libpcre-net2011.vcxproj create mode 100644 extern/pcre/libpcre-net2011.vcxproj.filters diff --git a/extern/pcre/libpcre-net2011.vcxproj b/extern/pcre/libpcre-net2011.vcxproj new file mode 100644 index 0000000000..f5452da60d --- /dev/null +++ b/extern/pcre/libpcre-net2011.vcxproj @@ -0,0 +1,94 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {91920268-4395-419F-8CE5-DA7E11A5C1FD} + libpcre + libpcre + + + + StaticLibrary + true + v110 + MultiByte + + + StaticLibrary + false + v110 + true + MultiByte + + + + + + + + + + + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + + Level3 + Disabled + true + + + CompileAsC + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + CompileAsC + + + true + true + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/pcre/libpcre-net2011.vcxproj.filters b/extern/pcre/libpcre-net2011.vcxproj.filters new file mode 100644 index 0000000000..8d453c3281 --- /dev/null +++ b/extern/pcre/libpcre-net2011.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/StepMania-net2011.vcxproj b/src/StepMania-net2011.vcxproj index b8b7c73dcc..2cd77773a5 100644 --- a/src/StepMania-net2011.vcxproj +++ b/src/StepMania-net2011.vcxproj @@ -1312,56 +1312,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" NotUsing NotUsing - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2346,8 +2296,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" - - @@ -2384,6 +2332,9 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" + + {91920268-4395-419f-8ce5-da7e11a5c1fd} + {f70dd0fe-a74a-42e7-b81f-e35c49fc9eb9} false diff --git a/src/StepMania-net2011.vcxproj.filters b/src/StepMania-net2011.vcxproj.filters index f1863366af..cdb5ac64a7 100644 --- a/src/StepMania-net2011.vcxproj.filters +++ b/src/StepMania-net2011.vcxproj.filters @@ -103,9 +103,6 @@ {a89b61cf-bbf6-4303-a32a-6eec76f78893} - - {b4c5e8c8-60f5-44c6-9529-832212276d1a} - {c2c701a5-a88f-4a36-ab40-43619668f88f} @@ -1500,21 +1497,6 @@ Helpers\libpng - - Helpers\pcre - - - Helpers\pcre - - - Helpers\pcre - - - Helpers\pcre - - - Helpers\pcre - Helpers\Lua @@ -2924,12 +2906,6 @@ Helpers\libpng - - Helpers\pcre - - - Helpers\pcre - Helpers\Lua @@ -3130,4 +3106,4 @@ BaseClasses - + \ No newline at end of file diff --git a/src/sm5-net2011.sln b/src/sm5-net2011.sln index 2f49e120cf..154391a364 100644 --- a/src/sm5-net2011.sln +++ b/src/sm5-net2011.sln @@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtommath", "libtommath\li EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtomcrypt", "libtomcrypt\libtomcrypt-net2011.vcxproj", "{F70DD0FE-A74A-42E7-B81F-E35C49FC9EB9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\extern\pcre\libpcre-net2011.vcxproj", "{91920268-4395-419F-8CE5-DA7E11A5C1FD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -39,6 +41,14 @@ Global {F70DD0FE-A74A-42E7-B81F-E35C49FC9EB9}.Release|Win32.Build.0 = Release|Win32 {F70DD0FE-A74A-42E7-B81F-E35C49FC9EB9}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 {F70DD0FE-A74A-42E7-B81F-E35C49FC9EB9}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {91920268-4395-419F-8CE5-DA7E11A5C1FD}.Debug|Win32.ActiveCfg = Debug|Win32 + {91920268-4395-419F-8CE5-DA7E11A5C1FD}.Debug|Win32.Build.0 = Debug|Win32 + {91920268-4395-419F-8CE5-DA7E11A5C1FD}.FastDebug|Win32.ActiveCfg = Debug|Win32 + {91920268-4395-419F-8CE5-DA7E11A5C1FD}.FastDebug|Win32.Build.0 = Debug|Win32 + {91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release|Win32.ActiveCfg = Release|Win32 + {91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release|Win32.Build.0 = Release|Win32 + {91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release-SSE2|Win32.ActiveCfg = Release|Win32 + {91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release-SSE2|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From f4eca5cc78afe9806e4ffcd53d92a1e48feb877b Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 16 Mar 2014 12:04:01 -0400 Subject: [PATCH 2/4] Move PNG to separate project (2011) --- extern/libpng/libpng-net2011.vcxproj | 114 +++++++++++++++++++ extern/libpng/libpng-net2011.vcxproj.filters | 30 +++++ src/StepMania-net2011.vcxproj | 100 +--------------- src/StepMania-net2011.vcxproj.filters | 69 ----------- src/sm5-net2011.sln | 10 ++ 5 files changed, 157 insertions(+), 166 deletions(-) create mode 100644 extern/libpng/libpng-net2011.vcxproj create mode 100644 extern/libpng/libpng-net2011.vcxproj.filters diff --git a/extern/libpng/libpng-net2011.vcxproj b/extern/libpng/libpng-net2011.vcxproj new file mode 100644 index 0000000000..730f741229 --- /dev/null +++ b/extern/libpng/libpng-net2011.vcxproj @@ -0,0 +1,114 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {046C857A-41C5-4E87-AD44-462AB17BBF4F} + libpng + libpng + + + + StaticLibrary + true + v110 + MultiByte + + + StaticLibrary + false + v110 + true + MultiByte + + + + + + + + + + + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + + Level3 + Disabled + true + + + CompileAsC + ..\zlib\ + _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + CompileAsC + ..\zlib\ + _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/libpng/libpng-net2011.vcxproj.filters b/extern/libpng/libpng-net2011.vcxproj.filters new file mode 100644 index 0000000000..11d711dacd --- /dev/null +++ b/extern/libpng/libpng-net2011.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/StepMania-net2011.vcxproj b/src/StepMania-net2011.vcxproj index 2cd77773a5..d46322e176 100644 --- a/src/StepMania-net2011.vcxproj +++ b/src/StepMania-net2011.vcxproj @@ -1222,96 +1222,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - - - NotUsing - NotUsing - NotUsing - NotUsing - @@ -2289,13 +2199,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" true - - - - - - - @@ -2332,6 +2235,9 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" + + {046c857a-41c5-4e87-ad44-462ab17bbf4f} + {91920268-4395-419f-8ce5-da7e11a5c1fd} diff --git a/src/StepMania-net2011.vcxproj.filters b/src/StepMania-net2011.vcxproj.filters index cdb5ac64a7..32357d1b86 100644 --- a/src/StepMania-net2011.vcxproj.filters +++ b/src/StepMania-net2011.vcxproj.filters @@ -100,9 +100,6 @@ {46a5ab77-6eaf-44eb-93ec-43b2db4741ff} - - {a89b61cf-bbf6-4303-a32a-6eec76f78893} - {c2c701a5-a88f-4a36-ab40-43619668f88f} @@ -1452,51 +1449,6 @@ BaseClasses - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - Helpers\Lua @@ -2885,27 +2837,6 @@ Helpers - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - - - Helpers\libpng - Helpers\Lua diff --git a/src/sm5-net2011.sln b/src/sm5-net2011.sln index 154391a364..bf7e49b524 100644 --- a/src/sm5-net2011.sln +++ b/src/sm5-net2011.sln @@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtomcrypt", "libtomcrypt\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\extern\pcre\libpcre-net2011.vcxproj", "{91920268-4395-419F-8CE5-DA7E11A5C1FD}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\extern\libpng\libpng-net2011.vcxproj", "{046C857A-41C5-4E87-AD44-462AB17BBF4F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -49,6 +51,14 @@ Global {91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release|Win32.Build.0 = Release|Win32 {91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release-SSE2|Win32.ActiveCfg = Release|Win32 {91920268-4395-419F-8CE5-DA7E11A5C1FD}.Release-SSE2|Win32.Build.0 = Release|Win32 + {046C857A-41C5-4E87-AD44-462AB17BBF4F}.Debug|Win32.ActiveCfg = Debug|Win32 + {046C857A-41C5-4E87-AD44-462AB17BBF4F}.Debug|Win32.Build.0 = Debug|Win32 + {046C857A-41C5-4E87-AD44-462AB17BBF4F}.FastDebug|Win32.ActiveCfg = Debug|Win32 + {046C857A-41C5-4E87-AD44-462AB17BBF4F}.FastDebug|Win32.Build.0 = Debug|Win32 + {046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release|Win32.ActiveCfg = Release|Win32 + {046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release|Win32.Build.0 = Release|Win32 + {046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release-SSE2|Win32.ActiveCfg = Release|Win32 + {046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release-SSE2|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From c578ac69d4d4ac1941ee366900490ee3b518fa9c Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 16 Mar 2014 12:59:27 -0400 Subject: [PATCH 3/4] Move GLEW to separate project (2011) Note: glext.h was removed due to it not being used. --- extern/glew-1.5.8/libglew-net2011.vcxproj | 90 +++++++++++++++++++ .../libglew-net2011.vcxproj.filters | 6 ++ src/StepMania-net2011.vcxproj | 22 ++--- src/StepMania-net2011.vcxproj.filters | 9 -- src/sm5-net2011.sln | 10 +++ 5 files changed, 113 insertions(+), 24 deletions(-) create mode 100644 extern/glew-1.5.8/libglew-net2011.vcxproj create mode 100644 extern/glew-1.5.8/libglew-net2011.vcxproj.filters diff --git a/extern/glew-1.5.8/libglew-net2011.vcxproj b/extern/glew-1.5.8/libglew-net2011.vcxproj new file mode 100644 index 0000000000..9f6f9a7490 --- /dev/null +++ b/extern/glew-1.5.8/libglew-net2011.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {9522F2E6-FFEB-4620-9EE2-79353A55671B} + libglew + libglew + + + + StaticLibrary + true + v110 + MultiByte + + + StaticLibrary + false + v110 + true + MultiByte + + + + + + + + + + + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + + Level3 + Disabled + true + + + CompileAsC + _MBCS;GLEW_STATIC;%(PreprocessorDefinitions) + ./include + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + CompileAsC + _MBCS;GLEW_STATIC;%(PreprocessorDefinitions) + ./include + + + true + true + true + + + + + + + + + \ No newline at end of file diff --git a/extern/glew-1.5.8/libglew-net2011.vcxproj.filters b/extern/glew-1.5.8/libglew-net2011.vcxproj.filters new file mode 100644 index 0000000000..6f74517bc7 --- /dev/null +++ b/extern/glew-1.5.8/libglew-net2011.vcxproj.filters @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/StepMania-net2011.vcxproj b/src/StepMania-net2011.vcxproj index d46322e176..9939cf4a12 100644 --- a/src/StepMania-net2011.vcxproj +++ b/src/StepMania-net2011.vcxproj @@ -126,7 +126,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" Disabled .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINDOWS;DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;GLEW_STATIC;_DEBUG;_WINDOWS;WINDOWS;DEBUG;%(PreprocessorDefinitions) Sync EnableFastChecks MultiThreadedDebugDLL @@ -194,7 +194,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" true Size .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINDOWS;RELEASE;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;GLEW_STATIC;NDEBUG;_WINDOWS;WINDOWS;RELEASE;%(PreprocessorDefinitions) true false Sync @@ -259,7 +259,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" MaxSpeed .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINDOWS;DEBUG;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;GLEW_STATIC;_DEBUG;_WINDOWS;WINDOWS;DEBUG;%(PreprocessorDefinitions) Sync Default MultiThreadedDebugDLL @@ -328,7 +328,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" true Speed .;..\extern\lua-5.1\src;..\extern\ffmpeg\include;BaseClasses;..\extern\jsoncpp\include;..\extern\glew-1.5.8\include;..\extern\pcre;..\extern\mad-0.15.1b;..\extern\libpng\lib;..\extern\libpng\include;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINDOWS;RELEASE;GLEW_STATIC;%(PreprocessorDefinitions) + WIN32;GLEW_STATIC;NDEBUG;_WINDOWS;WINDOWS;RELEASE;%(PreprocessorDefinitions) true false Sync @@ -1542,16 +1542,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" - - - - - - - - - - @@ -2198,7 +2188,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" true true - @@ -2235,6 +2224,9 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" + + {9522f2e6-ffeb-4620-9ee2-79353a55671b} + {046c857a-41c5-4e87-ad44-462ab17bbf4f} diff --git a/src/StepMania-net2011.vcxproj.filters b/src/StepMania-net2011.vcxproj.filters index 32357d1b86..e6d31f5a82 100644 --- a/src/StepMania-net2011.vcxproj.filters +++ b/src/StepMania-net2011.vcxproj.filters @@ -106,9 +106,6 @@ {52c8e19c-32ec-4115-bee6-f5957389d7ea} - - {ba251bae-0742-4c91-9b1f-488c32791a63} - @@ -1545,9 +1542,6 @@ Helpers\jsoncpp - - Helpers\glew - Data Structures @@ -2834,9 +2828,6 @@ Global Singletons - - Helpers - Helpers\Lua diff --git a/src/sm5-net2011.sln b/src/sm5-net2011.sln index bf7e49b524..c6d2330e9d 100644 --- a/src/sm5-net2011.sln +++ b/src/sm5-net2011.sln @@ -11,6 +11,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpcre", "..\extern\pcre\l EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\extern\libpng\libpng-net2011.vcxproj", "{046C857A-41C5-4E87-AD44-462AB17BBF4F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglew", "..\extern\glew-1.5.8\libglew-net2011.vcxproj", "{9522F2E6-FFEB-4620-9EE2-79353A55671B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -59,6 +61,14 @@ Global {046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release|Win32.Build.0 = Release|Win32 {046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release-SSE2|Win32.ActiveCfg = Release|Win32 {046C857A-41C5-4E87-AD44-462AB17BBF4F}.Release-SSE2|Win32.Build.0 = Release|Win32 + {9522F2E6-FFEB-4620-9EE2-79353A55671B}.Debug|Win32.ActiveCfg = Debug|Win32 + {9522F2E6-FFEB-4620-9EE2-79353A55671B}.Debug|Win32.Build.0 = Debug|Win32 + {9522F2E6-FFEB-4620-9EE2-79353A55671B}.FastDebug|Win32.ActiveCfg = Debug|Win32 + {9522F2E6-FFEB-4620-9EE2-79353A55671B}.FastDebug|Win32.Build.0 = Debug|Win32 + {9522F2E6-FFEB-4620-9EE2-79353A55671B}.Release|Win32.ActiveCfg = Release|Win32 + {9522F2E6-FFEB-4620-9EE2-79353A55671B}.Release|Win32.Build.0 = Release|Win32 + {9522F2E6-FFEB-4620-9EE2-79353A55671B}.Release-SSE2|Win32.ActiveCfg = Release|Win32 + {9522F2E6-FFEB-4620-9EE2-79353A55671B}.Release-SSE2|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 9912c51e88c41c4bd7fcad61a104c2df1c615745 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 16 Mar 2014 14:03:02 -0400 Subject: [PATCH 4/4] Move LUA to separate project (2011) --- extern/lua-5.1/liblua-net2011.vcxproj | 142 ++++++++ extern/lua-5.1/liblua-net2011.vcxproj.filters | 60 ++++ src/StepMania-net2011.vcxproj | 316 +----------------- src/StepMania-net2011.vcxproj.filters | 159 --------- src/sm5-net2011.sln | 10 + 5 files changed, 215 insertions(+), 472 deletions(-) create mode 100644 extern/lua-5.1/liblua-net2011.vcxproj create mode 100644 extern/lua-5.1/liblua-net2011.vcxproj.filters diff --git a/extern/lua-5.1/liblua-net2011.vcxproj b/extern/lua-5.1/liblua-net2011.vcxproj new file mode 100644 index 0000000000..33e0f68a50 --- /dev/null +++ b/extern/lua-5.1/liblua-net2011.vcxproj @@ -0,0 +1,142 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {0555A743-D202-409C-A331-349FEE971025} + liblua + liblua + + + + StaticLibrary + true + v110 + MultiByte + + + StaticLibrary + false + v110 + true + MultiByte + + + + + + + + + + + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + $(IntDir) + $(SolutionDir)/build-$(SolutionName)/$(ProjectName)/$(Configuration)\ + + + + Level3 + Disabled + true + + + CompileAsC + _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + CompileAsC + _MBCS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extern/lua-5.1/liblua-net2011.vcxproj.filters b/extern/lua-5.1/liblua-net2011.vcxproj.filters new file mode 100644 index 0000000000..033b2b728e --- /dev/null +++ b/extern/lua-5.1/liblua-net2011.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/StepMania-net2011.vcxproj b/src/StepMania-net2011.vcxproj index 9939cf4a12..846feec821 100644 --- a/src/StepMania-net2011.vcxproj +++ b/src/StepMania-net2011.vcxproj @@ -1222,296 +1222,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2188,29 +1898,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" true true - - - - - - - - - - - - - - - - - - - - - - - @@ -2230,6 +1917,9 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" {046c857a-41c5-4e87-ad44-462ab17bbf4f} + + {0555a743-d202-409c-a331-349fee971025} + {91920268-4395-419f-8ce5-da7e11a5c1fd} diff --git a/src/StepMania-net2011.vcxproj.filters b/src/StepMania-net2011.vcxproj.filters index e6d31f5a82..9b43a92ff6 100644 --- a/src/StepMania-net2011.vcxproj.filters +++ b/src/StepMania-net2011.vcxproj.filters @@ -100,9 +100,6 @@ {46a5ab77-6eaf-44eb-93ec-43b2db4741ff} - - {c2c701a5-a88f-4a36-ab40-43619668f88f} - {52c8e19c-32ec-4115-bee6-f5957389d7ea} @@ -1446,93 +1443,6 @@ BaseClasses - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - Helpers\jsoncpp @@ -2828,75 +2738,6 @@ Global Singletons - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - - - Helpers\Lua - Data Structures diff --git a/src/sm5-net2011.sln b/src/sm5-net2011.sln index c6d2330e9d..c7498d19cc 100644 --- a/src/sm5-net2011.sln +++ b/src/sm5-net2011.sln @@ -13,6 +13,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\extern\libpng\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libglew", "..\extern\glew-1.5.8\libglew-net2011.vcxproj", "{9522F2E6-FFEB-4620-9EE2-79353A55671B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\extern\lua-5.1\liblua-net2011.vcxproj", "{0555A743-D202-409C-A331-349FEE971025}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -69,6 +71,14 @@ Global {9522F2E6-FFEB-4620-9EE2-79353A55671B}.Release|Win32.Build.0 = Release|Win32 {9522F2E6-FFEB-4620-9EE2-79353A55671B}.Release-SSE2|Win32.ActiveCfg = Release|Win32 {9522F2E6-FFEB-4620-9EE2-79353A55671B}.Release-SSE2|Win32.Build.0 = Release|Win32 + {0555A743-D202-409C-A331-349FEE971025}.Debug|Win32.ActiveCfg = Debug|Win32 + {0555A743-D202-409C-A331-349FEE971025}.Debug|Win32.Build.0 = Debug|Win32 + {0555A743-D202-409C-A331-349FEE971025}.FastDebug|Win32.ActiveCfg = Debug|Win32 + {0555A743-D202-409C-A331-349FEE971025}.FastDebug|Win32.Build.0 = Debug|Win32 + {0555A743-D202-409C-A331-349FEE971025}.Release|Win32.ActiveCfg = Release|Win32 + {0555A743-D202-409C-A331-349FEE971025}.Release|Win32.Build.0 = Release|Win32 + {0555A743-D202-409C-A331-349FEE971025}.Release-SSE2|Win32.ActiveCfg = Release|Win32 + {0555A743-D202-409C-A331-349FEE971025}.Release-SSE2|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE