Merge pull request 'Adaptations for compiling under Windows using MSVC' (#36) from windows_fixes into master

Reviewed-on: #36
Reviewed-by: daniel_j <daniel@danieljon.es>

CMakeLists.txt

@@ -25,6 +25,17 @@ include_directories(${IIRC_SOURCE_DIR})
 include_directories(${IIRC_SOURCE_DIR}/IdealIRC)
 include_directories(${CMAKE_BINARY_DIR})
 
+#
+# Additional paths
+#
+option(IIRC_DEP_EXTRAS OFF)
+option(IIRC_DEP_INCLUDE "")
+option(IIRC_DEP_LIBRARY "")
+if (${IIRC_DEP_EXTRAS})
+	include_directories(${IIRC_DEP_INCLUDE})
+	link_directories(${IIRC_DEP_LIBRARY})
+endif()
+
 # For GCC and Clang, basically.
 if (UNIX)
 #	set(CMAKE_CXX_FLAGS "-Wall -Werror")

ICommand/CommandData.h

@@ -5,7 +5,7 @@
 #include <QVariant>
 #include <vector>
 #include <functional>
-
+#include <optional>
 
 using PredicateList = std::vector<	std::function<
 										std::optional<std::string>

IRCClient/IRCBase.cpp

@@ -1206,6 +1206,11 @@ void IRCBasePriv::parseIncoming(const std::string& line)
 		super.onMsgPong(msg);
 	}
 
+// In Windows, wingdi.h, this is defined and we don't use it in this here source file.
+#if defined(ERROR)
+#undef ERROR
+#endif
+
 	else if (command == ERROR) {
 		super.onMsgError(msg);
 	}

IWin/NicklistController.h

@@ -23,6 +23,7 @@
 #include <QObject>
 #include <QListWidget>
 #include <memory>
+#include <optional>
 
 class IRC;
 class IRCChannel;

Script/Builtin/CMakeLists.txt

@@ -21,5 +21,7 @@ list(APPEND ${component}_SOURCES
 
 add_library(${component} STATIC ${${component}_SOURCES})
 qt5_use_modules(${component} Core)
-target_link_libraries(${component} m)
+if (UNIX)
+    target_link_libraries(${component} m)
+endif()
 target_include_directories(${component} PRIVATE ${CMAKE_SOURCE_DIR})

Script/Tokenizer.cpp

@@ -784,7 +784,7 @@ bool TokenizerPriv::processDialogAttr(T& dialog_or_widget)
 
 bool TokenizerPriv::processDialogWidgetTab(Dialog& dialog)
 {
-
+    return false; // TODO this function
 }
 
 bool TokenizerPriv::processDialogWidget(Dialog& dialog, DialogWidget::Type wtype)