fixed project file settings for those renamed files and fixed a typo

obs/CMakeLists.txt

@@ -41,8 +41,8 @@ elseif(UNIX)
 endif()
 
 add_executable(obs
-	window-main-basic.cpp
-	window-settings-basic.cpp
+	window-basic-main.cpp
+	window-basic-settings.cpp
 	settings-basic.cpp
 	settings-basic-general.cpp
 	settings-basic-video.cpp

obs/makefile.am

@@ -13,8 +13,8 @@ endif
 
 obs_PROGRAMS = obs
 obs_LDADD = $(top_srcdir)/libobs/libobs.la
-obs_SOURCES = window-main-basic.cpp \
-	      window-settings-basic.cpp \
+obs_SOURCES = window-basic-main.cpp \
+	      window-basic-settings.cpp \
 	      settings-basic.cpp \
 	      settings-basic-general.cpp \
 	      settings-basic-video.cpp \

obs/settings-basic.cpp

@@ -16,7 +16,7 @@
 ******************************************************************************/
 
 #include "settings-basic.hpp"
-#include "window-basic-settingshpp"
+#include "window-basic-settings.hpp"
 
 void BasicSettingsData::SetChanged()
 {

vs/2013/OBS/OBS.vcxproj

@@ -177,8 +177,8 @@
     <ClCompile Include="..\..\..\obs\settings-basic-general.cpp" />
     <ClCompile Include="..\..\..\obs\settings-basic-video.cpp" />
     <ClCompile Include="..\..\..\obs\settings-basic.cpp" />
-    <ClCompile Include="..\..\..\obs\window-main-basic.cpp" />
-    <ClCompile Include="..\..\..\obs\window-settings-basic.cpp" />
+    <ClCompile Include="..\..\..\obs\window-basic-main.cpp" />
+    <ClCompile Include="..\..\..\obs\window-basic-settings.cpp" />
     <ClCompile Include="..\..\..\obs\wx-subclass.cpp" />
     <ClCompile Include="..\..\..\obs\wx-wrappers.cpp" />
   </ItemGroup>
@@ -188,8 +188,8 @@
     <ClInclude Include="..\..\..\obs\platform.hpp" />
     <ClInclude Include="..\..\..\obs\settings-basic.hpp" />
     <ClInclude Include="..\..\..\obs\settings.hpp" />
-    <ClInclude Include="..\..\..\obs\window-main-basic.hpp" />
-    <ClInclude Include="..\..\..\obs\window-settings-basic.hpp" />
+    <ClInclude Include="..\..\..\obs\window-basic-main.hpp" />
+    <ClInclude Include="..\..\..\obs\window-basic-settings.hpp" />
     <ClInclude Include="..\..\..\obs\wx-subclass.hpp" />
     <ClInclude Include="..\..\..\obs\wx-wrappers.hpp" />
   </ItemGroup>

vs/2013/OBS/OBS.vcxproj.filters

@@ -27,18 +27,12 @@
     <ClCompile Include="..\..\..\obs\forms\OBSWindows.cpp">
       <Filter>wx forms</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\obs\window-main-basic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\obs\wx-subclass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\obs\platform-windows.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\obs\window-settings-basic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\obs\settings-basic-general.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -48,6 +42,12 @@
     <ClCompile Include="..\..\..\obs\settings-basic.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\obs\window-basic-main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\obs\window-basic-settings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\obs\obs-app.hpp">
@@ -59,23 +59,23 @@
     <ClInclude Include="..\..\..\obs\forms\OBSWindows.h">
       <Filter>wx forms</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\obs\window-main-basic.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\obs\wx-subclass.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\obs\platform.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\obs\window-settings-basic.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\obs\settings-basic.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\obs\settings.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\obs\window-basic-main.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\obs\window-basic-settings.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file