From c8c3c701db4e9029175fea1434a2a49628bb1a5c Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 18:45:42 -0700 Subject: [PATCH] A few more fixes (cherry picked from commit 0cbab3fb6ec5c1b713d95314c50517796420c768) --- Sources/Plasma/Apps/plClient/res/plClient.rc | 4 +- .../Plasma/FeatureLib/pfPython/CMakeLists.txt | 4 -- .../NucleusLib/pnDispatch/CMakeLists.txt | 1 + .../NucleusLib/pnKeyedObject/CMakeLists.txt | 57 ++++++++++--------- .../NucleusLib/pnSceneObject/CMakeLists.txt | 55 +++++++++--------- 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/Sources/Plasma/Apps/plClient/res/plClient.rc b/Sources/Plasma/Apps/plClient/res/plClient.rc index dcdd610d..f72a0d71 100644 --- a/Sources/Plasma/Apps/plClient/res/plClient.rc +++ b/Sources/Plasma/Apps/plClient/res/plClient.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include \r\n" "\0" END diff --git a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt index c8f3a9b3..4cde1637 100644 --- a/Sources/Plasma/FeatureLib/pfPython/CMakeLists.txt +++ b/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 diff --git a/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt index 381d8318..7e8eaf6e 100644 --- a/Sources/Plasma/NucleusLib/pnDispatch/CMakeLists.txt +++ b/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 diff --git a/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt index 614a6ef1..11ebd1fa 100644 --- a/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnKeyedObject/CMakeLists.txt @@ -1,28 +1,29 @@ -include_directories("../../CoreLib") -include_directories("../../NucleusLib") -include_directories("../../NucleusLib/inc") - -set(pnKeyedObject_HEADERS - hsKeyedObject.h - plFixedKey.h - plKey.h - plKeyImp.h - plMsgForwarder.h - plReceiver.h - plUoid.h - pnKeyedObjectCreatable.h -) - -set(pnKeyedObject_SOURCES - hsKeyedObject.cpp - plFixedKey.cpp - plKey.cpp - plKeyImp.cpp - plMsgForwarder.cpp - plUoid.cpp -) - -add_library(pnKeyedObject STATIC ${pnKeyedObject_HEADERS} ${pnKeyedObject_SOURCES}) - -source_group("Header Files" FILES ${pnKeyedObject_HEADERS}) -source_group("Source Files" FILES ${pnKeyedObject_SOURCES}) +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") +include_directories("../../PubUtilLib") + +set(pnKeyedObject_HEADERS + hsKeyedObject.h + plFixedKey.h + plKey.h + plKeyImp.h + plMsgForwarder.h + plReceiver.h + plUoid.h + pnKeyedObjectCreatable.h +) + +set(pnKeyedObject_SOURCES + hsKeyedObject.cpp + plFixedKey.cpp + plKey.cpp + plKeyImp.cpp + plMsgForwarder.cpp + plUoid.cpp +) + +add_library(pnKeyedObject STATIC ${pnKeyedObject_HEADERS} ${pnKeyedObject_SOURCES}) + +source_group("Header Files" FILES ${pnKeyedObject_HEADERS}) +source_group("Source Files" FILES ${pnKeyedObject_SOURCES}) diff --git a/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt b/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt index 11ad2c4a..c93d2bd1 100644 --- a/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt +++ b/Sources/Plasma/NucleusLib/pnSceneObject/CMakeLists.txt @@ -1,27 +1,28 @@ -include_directories("../../CoreLib") -include_directories("../../NucleusLib") -include_directories("../../NucleusLib/inc") - -set(pnSceneObject_HEADERS - plAudioInterface.h - plCoordinateInterface.h - plDrawInterface.h - plObjInterface.h - plSceneObject.h - plSimulationInterface.h - pnSceneObjectCreatable.h -) - -set(pnSceneObject_SOURCES - plAudioInterface.cpp - plCoordinateInterface.cpp - plDrawInterface.cpp - plObjInterface.cpp - plSceneObject.cpp - plSimulationInterface.cpp -) - -add_library(pnSceneObject STATIC ${pnSceneObject_HEADERS} ${pnSceneObject_SOURCES}) - -source_group("Header Files" FILES ${pnSceneObject_HEADERS}) -source_group("Source Files" FILES ${pnSceneObject_SOURCES}) +include_directories("../../CoreLib") +include_directories("../../NucleusLib") +include_directories("../../NucleusLib/inc") +include_directories("../../PubUtilLib") + +set(pnSceneObject_HEADERS + plAudioInterface.h + plCoordinateInterface.h + plDrawInterface.h + plObjInterface.h + plSceneObject.h + plSimulationInterface.h + pnSceneObjectCreatable.h +) + +set(pnSceneObject_SOURCES + plAudioInterface.cpp + plCoordinateInterface.cpp + plDrawInterface.cpp + plObjInterface.cpp + plSceneObject.cpp + plSimulationInterface.cpp +) + +add_library(pnSceneObject STATIC ${pnSceneObject_HEADERS} ${pnSceneObject_SOURCES}) + +source_group("Header Files" FILES ${pnSceneObject_HEADERS}) +source_group("Source Files" FILES ${pnSceneObject_SOURCES})