From 325953eee5366336a4c8ced0dbc20fab6cfb621e Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 2 Aug 2011 23:32:01 -0400 Subject: [PATCH] Compile fixes for PlasmaMAX --- Sources/Tools/MaxMain/CMakeLists.txt | 4 +++- Sources/Tools/MaxMain/SimpleExport.rc | 15 --------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Sources/Tools/MaxMain/CMakeLists.txt b/Sources/Tools/MaxMain/CMakeLists.txt index d39c5d25..f78f70c7 100644 --- a/Sources/Tools/MaxMain/CMakeLists.txt +++ b/Sources/Tools/MaxMain/CMakeLists.txt @@ -96,6 +96,7 @@ endif() target_link_libraries(MaxMain ${EXPAT_LIBRARY}) target_link_libraries(MaxMain ${DirectX_LIBRARIES}) target_link_libraries(MaxMain ${JPEG_LIBRARY}) +target_link_libraries(MaxMain ${PNG_LIBRARY}) target_link_libraries(MaxMain ${Ogg_LIBRARIES}) target_link_libraries(MaxMain ${OPENAL_LIBRARY}) target_link_libraries(MaxMain ${OPENSSL_LIBRARIES}) @@ -105,7 +106,7 @@ target_link_libraries(MaxMain optimized ${PYTHON_LIBRARY}) target_link_libraries(MaxMain ${Speex_LIBRARY}) target_link_libraries(MaxMain ${Vorbis_LIBRARIES}) -# Carbon copy from MaxMain +# Carbon copy from plClient # TODO: Maybe see if some of these can be removed? target_link_libraries(MaxMain CoreLib) target_link_libraries(MaxMain CoreLibExe) @@ -135,6 +136,7 @@ target_link_libraries(MaxMain plAudioCore) target_link_libraries(MaxMain plAvatar) target_link_libraries(MaxMain plCompression) target_link_libraries(MaxMain plContainer) +target_link_libraries(MaxMain plClientResMgr) target_link_libraries(MaxMain plDrawable) target_link_libraries(MaxMain plEncryption) target_link_libraries(MaxMain plFile) diff --git a/Sources/Tools/MaxMain/SimpleExport.rc b/Sources/Tools/MaxMain/SimpleExport.rc index cb57200e..33931d00 100644 --- a/Sources/Tools/MaxMain/SimpleExport.rc +++ b/Sources/Tools/MaxMain/SimpleExport.rc @@ -449,21 +449,6 @@ BEGIN END #endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_CURSOR_UP BITMAP "../../Plasma/Apps/plClient/res/cursor_up.bmp" -IDB_CURSOR_DOWN BITMAP "../../Plasma/Apps/plClient/res/cursor_down.bmp" -IDB_CURSOR_RIGHT BITMAP "../../Plasma/Apps/plClient/res/cursor_right.bmp" -IDB_CURSOR_LEFT BITMAP "../../Plasma/Apps/plClient/res/cursor_left.bmp" -IDB_CURSOR_OPEN BITMAP "../../Plasma/Apps/plClient/res/cursor_open.bmp" -IDB_CURSOR_GRAB BITMAP "../../Plasma/Apps/plClient/res/cursor_grab.bmp" -IDB_CURSOR_CLICKED BITMAP "../../Plasma/Apps/plClient/res/cursor_clicked.bmp" -IDB_CURSOR_POISED BITMAP "../../Plasma/Apps/plClient/res/cursor_poised.bmp" - ///////////////////////////////////////////////////////////////////////////// // // Menu