Windows fixes

kipr · Jul 5, 2013 · d46db66 · d46db66
1 parent 3e0ddcc
commit d46db66
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,7 +89,7 @@ ELSEIF(UNIX)
 ELSEIF(WIN32)
 	SET(COMPAT_SRCS ${COMPAT}/mingw.c)
 	SET(CMAKE_CXX_FLAGS "-Wl,--enable-auto-import")
-	ADD_EXECUTABLE(KISS WIN32 ${KISS_SRCS_CXX} ${COMPAT_SRCS} ${CMAKE_SOURCE_DIR}/rc/logos/kiss.rc)
+	ADD_EXECUTABLE(KISS WIN32 ${KISS_SRCS_CXX} ${COMPAT_SRCS})
 ENDIF()
 
 ADD_LIBRARY(kisside STATIC ${KISS_SRCS_CXX})

diff --git a/rc/logos/kiss.rc b/rc/logos/kiss.rc
@@ -1 +1 @@
-IDI_ICON1               ICON    DISCARDABLE     "rc\\logos\\windows_icon.ico"
+IDI_ICON1 ICON DISCARDABLE "rc\\logos\\windows_icon.ico"
diff --git a/src/project/project.cpp b/src/project/project.cpp
@@ -59,6 +59,7 @@ const bool Kiss::Project::Project::compile() const
 			return false;
 		}
 		depProject->setSetting("TERMINAL_TYPE", "LIBRARY");
+		depProject->setSetting("LIBRARY_NAME", depProject->name());
 		depProject->setTarget(m_target);
 		depProject->compile();
 	}