diff --git a/CMakeLists.txt b/CMakeLists.txt
index e42703ae..b324068d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,8 @@ if (WIN32)
 	set(LIBSNDFILE_INCLUDE_DIR ${LIBSNDFILE_INCLUDE_DIR} "${DEPS_DIR}/libsndfile/include")
 	set(LUAJIT_INCLUDE_DIR ${LUAJIT_INCLUDE_DIR} "${DEPS_DIR}/luajit/include")
 	set(PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIR} "${DEPS_DIR}/python/include")
-
+	set(libserialport_INCLUDE_DIR ${LIBSERIALPORT_INCLUDE_DIR} "${DEPS_DIR}/libserialport/include")
+	
 	if (${CMAKE_EXE_LINKER_FLAGS} STREQUAL "/machine:x86")
 		#set(GLEW_LIBRARY ${GLEW_LIBRARY} "${DEPS_DIR}/glew/lib/x86/glew32s.lib")
 		#set(GLFW3_LIBRARIES ${GLFW3_LIBRARIES} "${DEPS_DIR}/glfw/lib/x86/glfw3.lib")
@@ -122,6 +123,7 @@ if (WIN32)
 	set(LIBSNDFILE_LIBRARY ${LIBSNDFILE_LIBRARY} "${DEPS_DIR}/libsndfile/lib/${ARCH}/libsndfile-1.lib")
 	set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARIES} "${DEPS_DIR}/luajit/lib/${ARCH}/lua51.lib")
 	set(PYTHON_LIBRARY ${PYTHON_LIBRARY} "${DEPS_DIR}/python/lib/${ARCH}/python27.lib")	
+	set(libserialport_LIBRARY ${LIBSERIALPORT_LIBRARY} "${DEPS_DIR}/libserialport/lib/${ARCH}/libserialport-0.lib")	
 	
 endif()
 
diff --git a/eu07.rc b/eu07.rc
index 5c6531bc..c4c70cdc 100644
--- a/eu07.rc
+++ b/eu07.rc
@@ -1,100 +1,2 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-/////////////////////////////////////////////////////////////////////////////
-// Polish (Poland) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-#pragma code_page(1250)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON                    "eu07.ico"
-
-GLFW_ICON               ICON                    "eu07.ico"
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 17,913,64,0
- PRODUCTVERSION 17,913,64,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "041504b0"
-        BEGIN
-            VALUE "CompanyName", "MaSzyna Team"
-            VALUE "FileDescription", "MaSzyna EU07-424"
-            VALUE "FileVersion", "17.913.64.0"
-            VALUE "InternalName", "eu07.exe"
-            VALUE "LegalCopyright", "Copyright (C) 2017"
-            VALUE "OriginalFilename", "EU07++.exe"
-            VALUE "ProductName", "MaSzyna"
-            VALUE "ProductVersion", "17.913.64.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x415, 1200
-    END
-END
-
-#endif    // Polish (Poland) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+IDI_ICON1 ICON "eu07.ico"
+GLFW_ICON ICON "eu07.ico"
\ No newline at end of file
diff --git a/ref/libserialport/lib/win64/libserialport-0.lib b/ref/libserialport/lib/x64/libserialport-0.lib
similarity index 100%
rename from ref/libserialport/lib/win64/libserialport-0.lib
rename to ref/libserialport/lib/x64/libserialport-0.lib
diff --git a/ref/libserialport/lib/win32/libserialport-0.lib b/ref/libserialport/lib/x86/libserialport-0.lib
similarity index 100%
rename from ref/libserialport/lib/win32/libserialport-0.lib
rename to ref/libserialport/lib/x86/libserialport-0.lib