diff --git a/build/vs2010/Lol.sln b/build/vs2010/Lol.sln index bed32332..de980c48 100644 --- a/build/vs2010/Lol.sln +++ b/build/vs2010/Lol.sln @@ -108,6 +108,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VsLol", "VsLol", "{9CC50C06 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsLol", "..\..\tools\vslol\VsLol.csproj", "{58922993-9830-4A40-B462-0326342F69ED}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04_texture", "..\..\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -567,6 +569,32 @@ Global {58922993-9830-4A40-B462-0326342F69ED}.Release|x64.ActiveCfg = Release|Any CPU {58922993-9830-4A40-B462-0326342F69ED}.Release|x64.Build.0 = Release|Any CPU {58922993-9830-4A40-B462-0326342F69ED}.Release|Xbox 360.ActiveCfg = Release|Any CPU + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Any CPU.ActiveCfg = Debug|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Mixed Platforms.ActiveCfg = Debug|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Mixed Platforms.Build.0 = Debug|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Mixed Platforms.Deploy.0 = Debug|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|PS3.ActiveCfg = Debug|PS3 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|PS3.Build.0 = Debug|PS3 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.ActiveCfg = Debug|Win32 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.Build.0 = Debug|Win32 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.ActiveCfg = Debug|x64 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.Build.0 = Debug|x64 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Any CPU.ActiveCfg = Release|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Mixed Platforms.ActiveCfg = Release|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Mixed Platforms.Build.0 = Release|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Mixed Platforms.Deploy.0 = Release|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|PS3.ActiveCfg = Release|PS3 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|PS3.Build.0 = Release|PS3 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.ActiveCfg = Release|Win32 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.Build.0 = Release|Win32 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.ActiveCfg = Release|x64 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.Build.0 = Release|x64 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Xbox 360.Build.0 = Release|Xbox 360 + {834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -593,6 +621,7 @@ Global {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {BCEE0132-8E24-49BE-AFEB-96DAD14396BA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} + {834852DB-EDB6-4FD0-BCF9-45CD01126962} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46} {EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601} {B357514A-7881-422D-8358-161B689E7620} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5} diff --git a/tutorial/04_texture.cpp b/tutorial/04_texture.cpp index 10a5d713..81a4ff4e 100644 --- a/tutorial/04_texture.cpp +++ b/tutorial/04_texture.cpp @@ -142,12 +142,6 @@ int main(int argc, char **argv) { Application app("Tutorial 4: Texture", ivec2(640, 480), 60.0f); -#if defined _MSC_VER && !defined _XBOX - _chdir("../.."); -#elif defined _WIN32 && !defined _XBOX - _chdir("../.."); -#endif - new TextureDemo(); app.Run();