A few more fixes

(cherry picked from commit 0cbab3fb6e)

Sources/Plasma/Apps/plClient/res/plClient.rc

@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <afxres.h>
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -34,7 +34,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include <afxres.h>\r\n"
     "\0"
 END
 

Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt

@@ -9,10 +9,6 @@ include_directories(${PYTHON_INCLUDE_DIR})
 include_directories(${OPENAL_INCLUDE_DIR})
 include_directories(${OPENSSL_INCLUDE_DIR})
 
-if(WIN32)
-	add_definitions(-DWIN32)
-endif(WIN32)
-
 set(pfPython_SOURCES
 	cyAccountManagement.cpp
 	cyAnimation.cpp

Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt

@@ -1,6 +1,7 @@
 include_directories(../../CoreLib)
 include_directories(../../NucleusLib)
 include_directories(../../NucleusLib/inc)
+include_directories("../../PubUtilLib")
 
 set(pnDispatch_SOURCES
     plDispatch.cpp

Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt

@@ -1,28 +1,29 @@
-include_directories("../../CoreLib")
+include_directories("../../CoreLib")
-include_directories("../../NucleusLib")
+include_directories("../../NucleusLib")
-include_directories("../../NucleusLib/inc")
+include_directories("../../NucleusLib/inc")
-
+include_directories("../../PubUtilLib")
-set(pnKeyedObject_HEADERS
+
-	hsKeyedObject.h
+set(pnKeyedObject_HEADERS
-	plFixedKey.h
+	hsKeyedObject.h
-	plKey.h
+	plFixedKey.h
-	plKeyImp.h
+	plKey.h
-	plMsgForwarder.h
+	plKeyImp.h
-	plReceiver.h
+	plMsgForwarder.h
-	plUoid.h
+	plReceiver.h
-	pnKeyedObjectCreatable.h
+	plUoid.h
-)
+	pnKeyedObjectCreatable.h
-
+)
-set(pnKeyedObject_SOURCES
+
-	hsKeyedObject.cpp
+set(pnKeyedObject_SOURCES
-	plFixedKey.cpp
+	hsKeyedObject.cpp
-	plKey.cpp
+	plFixedKey.cpp
-	plKeyImp.cpp
+	plKey.cpp
-	plMsgForwarder.cpp
+	plKeyImp.cpp
-	plUoid.cpp
+	plMsgForwarder.cpp
-)
+	plUoid.cpp
-
+)
-add_library(pnKeyedObject STATIC ${pnKeyedObject_HEADERS} ${pnKeyedObject_SOURCES})
+
-
+add_library(pnKeyedObject STATIC ${pnKeyedObject_HEADERS} ${pnKeyedObject_SOURCES})
-source_group("Header Files" FILES ${pnKeyedObject_HEADERS})
+
-source_group("Source Files" FILES ${pnKeyedObject_SOURCES})
+source_group("Header Files" FILES ${pnKeyedObject_HEADERS})
+source_group("Source Files" FILES ${pnKeyedObject_SOURCES})

Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt

@@ -1,27 +1,28 @@
-include_directories("../../CoreLib")
+include_directories("../../CoreLib")
-include_directories("../../NucleusLib")
+include_directories("../../NucleusLib")
-include_directories("../../NucleusLib/inc")
+include_directories("../../NucleusLib/inc")
-
+include_directories("../../PubUtilLib")
-set(pnSceneObject_HEADERS
+
-	plAudioInterface.h
+set(pnSceneObject_HEADERS
-	plCoordinateInterface.h
+	plAudioInterface.h
-	plDrawInterface.h
+	plCoordinateInterface.h
-	plObjInterface.h
+	plDrawInterface.h
-	plSceneObject.h
+	plObjInterface.h
-	plSimulationInterface.h
+	plSceneObject.h
-	pnSceneObjectCreatable.h
+	plSimulationInterface.h
-)
+	pnSceneObjectCreatable.h
-
+)
-set(pnSceneObject_SOURCES
+
-	plAudioInterface.cpp
+set(pnSceneObject_SOURCES
-	plCoordinateInterface.cpp
+	plAudioInterface.cpp
-	plDrawInterface.cpp
+	plCoordinateInterface.cpp
-	plObjInterface.cpp
+	plDrawInterface.cpp
-	plSceneObject.cpp
+	plObjInterface.cpp
-	plSimulationInterface.cpp
+	plSceneObject.cpp
-)
+	plSimulationInterface.cpp
-
+)
-add_library(pnSceneObject STATIC ${pnSceneObject_HEADERS} ${pnSceneObject_SOURCES})
+
-
+add_library(pnSceneObject STATIC ${pnSceneObject_HEADERS} ${pnSceneObject_SOURCES})
-source_group("Header Files" FILES ${pnSceneObject_HEADERS})
+
-source_group("Source Files" FILES ${pnSceneObject_SOURCES})
+source_group("Header Files" FILES ${pnSceneObject_HEADERS})
+source_group("Source Files" FILES ${pnSceneObject_SOURCES})