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()
 {