diff --git a/.gitignore b/.gitignore index 44dae2f7..c30c31be 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ CMakeFiles cmake_install.cmake install_manifest.txt build/ +build-*/ *.user *.suo diff --git a/Sources/Plasma/Apps/CMakeLists.txt b/Sources/Plasma/Apps/CMakeLists.txt index 9c6cef19..ede23503 100644 --- a/Sources/Plasma/Apps/CMakeLists.txt +++ b/Sources/Plasma/Apps/CMakeLists.txt @@ -2,3 +2,6 @@ add_subdirectory(plClient) add_subdirectory(plClientPatcher) add_subdirectory(plPythonPack) add_subdirectory(plUruLauncher) +add_subdirectory(plFileSecure) +add_subdirectory(plFileEncrypt) +add_subdirectory(plLogDecrypt) diff --git a/Sources/Plasma/Apps/plFileEncrypt/CMakeLists.txt b/Sources/Plasma/Apps/plFileEncrypt/CMakeLists.txt new file mode 100644 index 00000000..77e90504 --- /dev/null +++ b/Sources/Plasma/Apps/plFileEncrypt/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories("../../Apps") +include_directories("../../CoreLib") +include_directories("../../FeatureLib/inc") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib/inc") +include_directories("../../PubUtilLib") + +set(plFileEncrypt_SOURCES + main.cpp +) + +add_executable(plFileEncrypt ${plFileEncrypt_SOURCES}) +target_link_libraries(plFileEncrypt CoreLib CoreLibExe plFile plUnifiedTime pnProduct pnUtils) +target_link_libraries(plFileEncrypt Rpcrt4) + +source_group("Source Files" FILES ${plFileEncrypt_SOURCES}) diff --git a/Sources/Plasma/Apps/plFileSecure/CMakeLists.txt b/Sources/Plasma/Apps/plFileSecure/CMakeLists.txt new file mode 100644 index 00000000..31579f80 --- /dev/null +++ b/Sources/Plasma/Apps/plFileSecure/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories("../../Apps") +include_directories("../../CoreLib") +include_directories("../../FeatureLib/inc") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib/inc") +include_directories("../../PubUtilLib") + +set(plFileSecure_SOURCES + main.cpp +) + +add_executable(plFileSecure ${plFileSecure_SOURCES}) +target_link_libraries(plFileSecure CoreLib CoreLibExe plFile plUnifiedTime pnProduct pnUtils) +target_link_libraries(plFileSecure Rpcrt4) + +source_group("Source Files" FILES ${plFileSecure_SOURCES}) diff --git a/Sources/Plasma/Apps/plLogDecrypt/CMakeLists.txt b/Sources/Plasma/Apps/plLogDecrypt/CMakeLists.txt new file mode 100644 index 00000000..20372027 --- /dev/null +++ b/Sources/Plasma/Apps/plLogDecrypt/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories("../../Apps") +include_directories("../../CoreLib") +include_directories("../../FeatureLib/inc") +include_directories("../../FeatureLib") +include_directories("../../NucleusLib/inc") +include_directories("../../NucleusLib") +include_directories("../../PubUtilLib/inc") +include_directories("../../PubUtilLib") + +set(plLogDecrypt_SOURCES + plLogDecrypt.cpp +) + +add_executable(plLogDecrypt ${plLogDecrypt_SOURCES}) +target_link_libraries(plLogDecrypt CoreLib CoreLibExe plFile plUnifiedTime plStatusLog pnProduct pnUtils) +target_link_libraries(plLogDecrypt Rpcrt4) + +source_group("Source Files" FILES ${plLogDecrypt_SOURCES}) diff --git a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp index 22ae7e04..444c62c2 100644 --- a/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp +++ b/Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp @@ -47,12 +47,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStlUtils.h" #include "plFile/plFileUtils.h" #include "plStatusLog.h" -#include "plPipeline.h" -#include "plPipeline/plDebugText.h" #include "hsStlUtils.h" #include "plFile/hsFiles.h" #include "plUnifiedTime/plUnifiedTime.h" -#include "pnNetCommon/plNetApp.h" #include "pnUtils/pnUtils.h" #include "pnProduct/pnProduct.h" diff --git a/Sources/Tools/CMakeLists.txt b/Sources/Tools/CMakeLists.txt index b7581384..7ffc2291 100644 --- a/Sources/Tools/CMakeLists.txt +++ b/Sources/Tools/CMakeLists.txt @@ -1,7 +1,7 @@ #add_subdirectory(Migration) #add_subdirectory(plDatMerger) #add_subdirectory(plFontConverter) -#add_subdirectory(plResBrowser) +add_subdirectory(plResBrowser) # Max Stuff goes below here... if(3dsm_BUILD_PLUGIN) diff --git a/Sources/Tools/MaxMain/CMakeLists.txt b/Sources/Tools/MaxMain/CMakeLists.txt index f78f70c7..9f2c7b4c 100644 --- a/Sources/Tools/MaxMain/CMakeLists.txt +++ b/Sources/Tools/MaxMain/CMakeLists.txt @@ -134,6 +134,7 @@ target_link_libraries(MaxMain plAudible) target_link_libraries(MaxMain plAudio) target_link_libraries(MaxMain plAudioCore) target_link_libraries(MaxMain plAvatar) +target_link_libraries(MaxMain plClientResMgr) target_link_libraries(MaxMain plCompression) target_link_libraries(MaxMain plContainer) target_link_libraries(MaxMain plClientResMgr) diff --git a/Sources/Tools/plResBrowser/CMakeLists.txt b/Sources/Tools/plResBrowser/CMakeLists.txt new file mode 100644 index 00000000..ae38f5b8 --- /dev/null +++ b/Sources/Tools/plResBrowser/CMakeLists.txt @@ -0,0 +1,70 @@ +include_directories("../../Plasma/Apps") +include_directories("../../Plasma/CoreLib") +include_directories("../../Plasma/FeatureLib/inc") +include_directories("../../Plasma/FeatureLib") +include_directories("../../Plasma/NucleusLib/inc") +include_directories("../../Plasma/NucleusLib") +include_directories("../../Plasma/PubUtilLib/inc") +include_directories("../../Plasma/PubUtilLib") + +set(plResBrowser_HEADERS + plResTreeView.h + plWinRegistryTools.h +) + +set(plResBrowser_SOURCES + plResBrowser.cpp + plResBrowserWndProc.cpp + plResTreeView.cpp + plWinRegistryTools.cpp + ) + +set(plResBrowser_RESOURCES + res/plResBrowser.rc + res/resource.h + + res/dataicon.ico + res/icon1.ico + res/icon2.ico + res/indexico.ico + res/mergedda.ico + res/mergedin.ico + ) + +add_executable(plResBrowser WIN32 ${plResBrowser_SOURCES} ${plResBrowser_HEADERS} ${plResBrowser_RESOURCES}) + +target_link_libraries(plResBrowser CoreLib) +target_link_libraries(plResBrowser CoreLibExe) +target_link_libraries(plResBrowser plFile) +target_link_libraries(plResBrowser plMessage) +target_link_libraries(plResBrowser plResMgr) +target_link_libraries(plResBrowser plScene) +target_link_libraries(plResBrowser plStatusLog) +target_link_libraries(plResBrowser plUnifiedTime) +target_link_libraries(plResBrowser pnAddrInfo) +target_link_libraries(plResBrowser pnDispatch) +target_link_libraries(plResBrowser pnFactory) +target_link_libraries(plResBrowser pnKeyedObject) +target_link_libraries(plResBrowser pnMessage) +target_link_libraries(plResBrowser pnNetCommon) +target_link_libraries(plResBrowser pnNucleusInc) +target_link_libraries(plResBrowser pnProduct) +target_link_libraries(plResBrowser pnSceneObject) +target_link_libraries(plResBrowser pnTimer) +target_link_libraries(plResBrowser pnUtils) +target_link_libraries(plResBrowser pnUtilsExe) + +if (WIN32) + target_link_libraries(plResBrowser Rpcrt4) + target_link_libraries(plResBrowser Version) + target_link_libraries(plResBrowser Vfw32) + target_link_libraries(plResBrowser Ws2_32) + target_link_libraries(plResBrowser winmm) + target_link_libraries(plResBrowser strmiids) + target_link_libraries(plResBrowser comctl32) + target_link_libraries(plResBrowser shlwapi) +endif(WIN32) + +source_group("Source Files" FILES ${plResBrowser_SOURCES}) +source_group("Header Files" FILES ${plResBrowser_HEADERS}) +source_group("Resource Files" FILES ${plResBrowser_RESOURCES}) \ No newline at end of file diff --git a/Sources/Tools/plResBrowser/plResBrowser.cpp b/Sources/Tools/plResBrowser/plResBrowser.cpp index 34a5d707..be002d70 100644 --- a/Sources/Tools/plResBrowser/plResBrowser.cpp +++ b/Sources/Tools/plResBrowser/plResBrowser.cpp @@ -32,11 +32,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "res/resource.h" #include "pnAllCreatables.h" -#include "../plResMgr/plResMgrCreatable.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plResMgrSettings.h" -#include "../plMessage/plResMgrHelperMsg.h" -#include "../plUnifiedTime/plUnifiedTimeCreatable.h" +#include "plResMgr/plResMgrCreatable.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plResMgrSettings.h" +#include "plMessage/plResMgrHelperMsg.h" +#include "plUnifiedTime/plUnifiedTimeCreatable.h" REGISTER_CREATABLE(plResMgrHelperMsg); diff --git a/Sources/Tools/plResBrowser/plResBrowserWndProc.cpp b/Sources/Tools/plResBrowser/plResBrowserWndProc.cpp index bc1a5fca..e4ddc6e5 100644 --- a/Sources/Tools/plResBrowser/plResBrowserWndProc.cpp +++ b/Sources/Tools/plResBrowser/plResBrowserWndProc.cpp @@ -33,10 +33,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include #include "plResTreeView.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plResMgrSettings.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plResMgrSettings.h" #include "plWinRegistryTools.h" -#include "../plFile/hsFiles.h" +#include "plFile/hsFiles.h" #define IDC_REGTREEVIEW 1000 diff --git a/Sources/Tools/plResBrowser/plResTreeView.cpp b/Sources/Tools/plResBrowser/plResTreeView.cpp index a9e80d02..20041722 100644 --- a/Sources/Tools/plResBrowser/plResTreeView.cpp +++ b/Sources/Tools/plResBrowser/plResTreeView.cpp @@ -27,14 +27,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsWindows.h" #include "plResTreeView.h" -#include "../plResMgr/plResManager.h" -#include "../plResMgr/plRegistryHelpers.h" -#include "../plResMgr/plRegistryNode.h" -#include "../plResMgr/plPageInfo.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnFactory/plFactory.h" +#include "plResMgr/plResManager.h" +#include "plResMgr/plRegistryHelpers.h" +#include "plResMgr/plRegistryNode.h" +#include "plResMgr/plPageInfo.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnFactory/plFactory.h" #include #include @@ -129,7 +129,7 @@ class plResDlgLoader : public plRegistryPageIterator, public plRegistryKeyIterat fCurrPage = page; const plPageInfo &info = page->GetPageInfo(); - sprintf( str, "%s->%s->%s", info.GetAge(), info.GetPage() ); + sprintf( str, "%s->%s", info.GetAge(), info.GetPage() ); fCurrItem = AddLeaf( fTree, NULL, str, new plKeyInfo( nil, fCurrPage ) ); fCurrType = (UInt16)-1; diff --git a/Sources/Tools/plResBrowser/res/resource.h b/Sources/Tools/plResBrowser/res/resource.h index b9165d36..ea16ff89 100644 --- a/Sources/Tools/plResBrowser/res/resource.h +++ b/Sources/Tools/plResBrowser/res/resource.h @@ -46,6 +46,7 @@ #define IDC_LOCAL_ONLY 1025 #define IDC_BUILTIN 1026 #define IDC_VOLATILE 1027 +#define ID_FILE_OPEN 40001 #define ID_FILE_EXIT 40002 #define ID_FILE_OPENDIRECTORY 40003 #define ID_FILE_ABOUT 40004