diff --git a/Makefile.am b/Makefile.am index 892ad894..5872d6f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = src test tools gfx SUBDIRS += deushax SUBDIRS += monsterz SUBDIRS += mrpigeon +SUBDIRS += orbital DIST_SUBDIRS = $(SUBDIRS) EXTRA_DIST = bootstrap build-linux build-mingw build-mingw64 build-ps3 \ diff --git a/configure.ac b/configure.ac index 7b3ffc63..ff045603 100644 --- a/configure.ac +++ b/configure.ac @@ -372,6 +372,9 @@ AC_CONFIG_FILES( AC_CONFIG_FILES( [mrpigeon/Makefile ]) +AC_CONFIG_FILES( + [orbital/Makefile +]) AC_OUTPUT diff --git a/win32/lolengine.sln b/win32/lolengine.sln index d0903cf4..5a27d633 100644 --- a/win32/lolengine.sln +++ b/win32/lolengine.sln @@ -65,6 +65,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "mrpigeon.vcxpro EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{1DFE1729-4F1B-47CA-9819-72431FE14E25}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orbital", "Orbital", "{8C77EAA8-1077-4EF7-AE53-97C6C60A3601}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -229,6 +233,20 @@ Global {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Xbox 360.Build.0 = Release|Xbox 360 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Win32.ActiveCfg = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Win32.Build.0 = Debug|Win32 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|x64.ActiveCfg = Debug|x64 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|x64.Build.0 = Debug|x64 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Win32.ActiveCfg = Release|Win32 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Win32.Build.0 = Release|Win32 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|x64.ActiveCfg = Release|x64 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|x64.Build.0 = Release|x64 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Xbox 360.Build.0 = Release|Xbox 360 + {EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -237,6 +255,7 @@ Global {2F87CEAB-4818-443C-A5E3-6C34E7D967EC} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} {08C6A854-533D-4A1E-924E-C4A62281869F} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} {33704AA4-F2B5-4138-A40D-E3E77F89ED46} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} + {8C77EAA8-1077-4EF7-AE53-97C6C60A3601} = {1DFE1729-4F1B-47CA-9819-72431FE14E25} {17F0F184-4436-4D08-B8AA-16572EA238DB} = {2F87CEAB-4818-443C-A5E3-6C34E7D967EC} {9C66B179-0737-4BDA-AB42-2ADE478A9008} = {08C6A854-533D-4A1E-924E-C4A62281869F} {EF1A4E80-63FA-4EB0-B834-12B6C500F31C} = {08C6A854-533D-4A1E-924E-C4A62281869F} @@ -247,5 +266,6 @@ Global {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {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} EndGlobalSection EndGlobal diff --git a/win32/orbital.vcxproj b/win32/orbital.vcxproj new file mode 100644 index 00000000..56ea85b0 --- /dev/null +++ b/win32/orbital.vcxproj @@ -0,0 +1,58 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + + {ee203b88-44cf-4859-9d42-7a5f40fecb52} + Application + Win32Proj + + + + + + + + + + + + + + + diff --git a/win32/orbital.vcxproj.filters b/win32/orbital.vcxproj.filters new file mode 100644 index 00000000..feeaa3b7 --- /dev/null +++ b/win32/orbital.vcxproj.filters @@ -0,0 +1,9 @@ + + + + + + + + +