From 159f0c97b4fbb3c5aeafc7232178d51b7e63e097 Mon Sep 17 00:00:00 2001
From: urioxis <urioxis@6a861d04-ae47-0410-a6da-2d49beace72e>
Date: Fri, 25 Feb 2011 14:06:21 +0000
Subject: [PATCH] Win32cpp and musikServer now included in CMake and compile
 and run :D

---
 CMakeLists.txt                   |  3 +-
 src/server/CMakeLists.txt        | 74 ++++++++++++++++++++++++++++++++
 src/win32cpp/CMakeLists.txt      | 29 +++++++++++++
 src/win32cpp/Frame.hpp           |  1 +
 src/win32cpp/ImageList.hpp       |  2 +
 src/win32cpp/LinearLayout.hpp    |  1 +
 src/win32cpp/TrayIconManager.hpp |  1 +
 src/win32cpp/VirtualWindow.hpp   |  1 +
 8 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 src/server/CMakeLists.txt
 create mode 100644 src/win32cpp/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8dcbd176..c161ece64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,6 +110,7 @@ include_directories (
 add_subdirectory(src/3rdparty)
 add_subdirectory(src/core)
 add_subdirectory(src/contrib)
-#add_subdirectory(src/server)
+add_subdirectory(src/win32cpp)
+add_subdirectory(src/server)
 add_subdirectory(src/square)
 #add_subdirectory(src/cube)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
new file mode 100644
index 000000000..670b7dce7
--- /dev/null
+++ b/src/server/CMakeLists.txt
@@ -0,0 +1,74 @@
+set(SERVER_SOURCES 
+	ConnectedUsersController.cpp
+	ConnectedUsersListController.cpp
+	ConnectedUsersListModel.cpp
+	main.cpp
+	MainWindowController.cpp
+	pch.cpp
+	SyncpathController.cpp
+	SyncpathListController.cpp
+	SyncpathListModel.cpp
+	SyncpathView.cpp
+	users/EditUserController.cpp
+	users/EditUserView.cpp
+	users/UsersController.cpp
+	users/UsersListController.cpp
+	users/UsersListModel.cpp
+	users/UsersView.cpp
+	#resources/resource.rc
+)
+
+set (SERVER_HEADERS
+	ConnectedUsersController.hpp
+	ConnectedUsersListController.hpp
+	ConnectedUsersListModel.hpp
+	MainWindowController.hpp
+	pch.hpp
+	SyncpathController.hpp
+	SyncpathListController.hpp
+	SyncpathListModel.hpp
+	SyncpathView.hpp
+	resources/resource.h
+	users/EditUserController.hpp
+	users/EditUserView.hpp
+	users/UsersController.hpp
+	users/UsersListModel.hpp
+	users/UsersView.hpp
+)
+
+SOURCE_GROUP("Header Files\\users" FILES
+	users/EditUserController.hpp
+	users/EditUserView.hpp
+	users/UsersController.hpp
+	users/UsersListModel.hpp
+	users/UsersView.hpp)
+SOURCE_GROUP("Source Files\\users" FILES
+	users/EditUserController.cpp
+	users/EditUserView.cpp
+	users/UsersController.cpp
+	users/UsersListController.cpp
+	users/UsersListModel.cpp
+	users/UsersView.cpp)
+SOURCE_GROUP("Header Files\\resources" FILES 
+	resources/resource.h)
+
+
+if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+  add_definitions(-DWIN32)
+	if(NOT DEFINED MINGW)
+        	
+	endif(NOT DEFINED MINGW)
+else(CMAKE_SYSTEM_NAME MATCHES "Windows")
+  set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fpermissive)
+endif(CMAKE_SYSTEM_NAME MATCHES "Windows")
+
+add_definitions( 
+  -DXML_STATIC
+  -D_CRT_SECURE_NO_DEPRECATE
+  -D_DEBUG
+)
+
+add_executable( musikServer ${SERVER_SOURCES} ${SERVER_HEADERS})
+target_link_libraries( musikServer win32cpp musik comctl32)
+
+
diff --git a/src/win32cpp/CMakeLists.txt b/src/win32cpp/CMakeLists.txt
new file mode 100644
index 000000000..4ccdfc741
--- /dev/null
+++ b/src/win32cpp/CMakeLists.txt
@@ -0,0 +1,29 @@
+FILE (GLOB WIN32CPP_SOURCES *.cpp)
+FILE (GLOB WIN32CPP_HEADERS *.hpp)
+
+if(CMAKE_SYSTEM_NAME MATCHES "Windows")
+  add_definitions(-DWIN32)
+	if(NOT DEFINED MINGW)
+        	
+	endif(NOT DEFINED MINGW)
+else(CMAKE_SYSTEM_NAME MATCHES "Windows")
+  set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fpermissive)
+endif(CMAKE_SYSTEM_NAME MATCHES "Windows")
+
+add_definitions( 
+  -DXML_STATIC
+  -D_CRT_SECURE_NO_DEPRECATE
+  -D_DEBUG
+)
+
+include_directories( ${musikCube_SOURCE_DIR}/src/win32cpp )
+
+if (WIN32)
+	#Just until I can figure out how to get rid of the last linker errors when exporting dll functions
+	add_library( win32cpp STATIC ${WIN32CPP_SOURCES} ${WIN32CPP_HEADERS})
+else (WIN32)
+	add_library( win32cpp SHARED ${WIN32CPP_SOURCES} ${WIN32CPP_HEADERS})
+endif (WIN32)
+#target_link_libraries( win32cpp comctl32 )
+
+
diff --git a/src/win32cpp/Frame.hpp b/src/win32cpp/Frame.hpp
index 3bee12f2e..23d757d46 100644
--- a/src/win32cpp/Frame.hpp
+++ b/src/win32cpp/Frame.hpp
@@ -43,6 +43,7 @@
 #include <win32cpp/Win32Config.hpp>
 #include <win32cpp/Panel.hpp>
 #include <win32cpp/WindowPadding.hpp>
+#include <win32cpp/Application.hpp>
 
 namespace win32cpp {
 
diff --git a/src/win32cpp/ImageList.hpp b/src/win32cpp/ImageList.hpp
index 101e120e3..3966f3a48 100644
--- a/src/win32cpp/ImageList.hpp
+++ b/src/win32cpp/ImageList.hpp
@@ -39,6 +39,8 @@
 #pragma once
 
 #include <win32cpp/Win32Config.hpp>
+#include <win32cpp/Types.hpp>
+#include <win32cpp/Exception.hpp>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/win32cpp/LinearLayout.hpp b/src/win32cpp/LinearLayout.hpp
index 4f8a804ac..5964153dd 100644
--- a/src/win32cpp/LinearLayout.hpp
+++ b/src/win32cpp/LinearLayout.hpp
@@ -43,6 +43,7 @@
 #include <win32cpp/Win32Config.hpp>
 #include <win32cpp/Panel.hpp>
 #include <win32cpp/ILayout.hpp>
+#include <win32cpp/Application.hpp>
 
 namespace win32cpp {
 
diff --git a/src/win32cpp/TrayIconManager.hpp b/src/win32cpp/TrayIconManager.hpp
index 8265d950b..3d23a49a9 100644
--- a/src/win32cpp/TrayIconManager.hpp
+++ b/src/win32cpp/TrayIconManager.hpp
@@ -40,6 +40,7 @@
 
 #include <map>
 #include <win32cpp/Menu.hpp>
+#include <win32cpp/Window.hpp>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/win32cpp/VirtualWindow.hpp b/src/win32cpp/VirtualWindow.hpp
index 36ba51117..9388416a8 100644
--- a/src/win32cpp/VirtualWindow.hpp
+++ b/src/win32cpp/VirtualWindow.hpp
@@ -40,6 +40,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
+#include <win32cpp/Application.hpp>
 #include <win32cpp/Win32Config.hpp>
 #include <win32cpp/Panel.hpp>