Windows compatibility

.gitignore

@@ -2,3 +2,4 @@ build/
 cmake-build-*/
 .idea/
 .DS_Store
+/*.dir/

CMakeLists.txt

@@ -9,6 +9,7 @@ set(CMAKE_CXX_STANDARD 11)
 set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "")
 set(GLFW_BUILD_TESTS OFF CACHE BOOL "")
 set(GLFW_BUILD_DOCS OFF CACHE BOOL "")
+set(GLFW_INSTALL OFF CACHE BOOL "")
 
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
@@ -123,6 +124,11 @@ target_link_libraries(nimbleapp
 	${GLEW_LIBRARIES}
 )
 
+if(WIN32)
+	set(CMAKE_SUPPRESS_REGENERATION true)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
 if(NA_BUILD_EXAMPLE)
 	add_subdirectory(example)
 endif()

include/nimble/app.h

@@ -4,7 +4,7 @@
 #include "widget.h"
 #include "contentmanager.h"
 
-class GLFWwindow;
+struct GLFWwindow;
 struct lay_context;
 struct NVGcontext;
 

src/nimble/app.cpp

@@ -125,7 +125,7 @@ void na::Application::DoLayout()
 
 	lay_reset_context(m_layout);
 	lay_id root = lay_item(m_layout);
-	lay_set_size_xy(m_layout, root, m_bufferSize.x / pixelScale, m_bufferSize.y / pixelScale);
+	lay_set_size_xy(m_layout, root, (lay_scalar)(m_bufferSize.x / pixelScale), (lay_scalar)(m_bufferSize.y / pixelScale));
 
 	if (m_root != nullptr) {
 		m_root->DoLayout(m_layout, root);
@@ -187,7 +187,7 @@ void na::Application::SetWindowSize(const glm::ivec2 &size)
 
 float na::Application::GetPixelScale()
 {
-	return m_bufferSize.x / m_windowSize.x;
+	return m_bufferSize.x / (float)m_windowSize.x;
 }
 
 void na::Application::Selector(const s2::string &query, s2::list<Widget*> &out)

src/nimble/ini.cpp

@@ -51,6 +51,10 @@ na::IniPair* na::Ini::Get(const char* section, const char* key)
 void na::Ini::Load(const char* filename)
 {
 	FILE* fh = fopen(filename, "rb");
+	if (fh == nullptr) {
+		printf("Couldn't load %s\n", filename);
+		return;
+	}
 
 	IniSection* currentSection = (IniSection*)this;
 

src/nimble/widgetselector.cpp

@@ -30,7 +30,7 @@ void na::WidgetSelectorNode::Parse(s2::string query)
 {
 	const char* p = query;
 
-	char* pnext = strchr(p, ' ');
+	char* pnext = const_cast<char*>(strchr(p, ' '));
 	if (pnext != nullptr) {
 		*pnext = '\0';
 		pnext++;