Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

plClient Resources #51

Merged
merged 18 commits into from
Jul 21, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ find_package(PythonLibs REQUIRED)
find_package(EXPAT REQUIRED)
find_package(ZLIB REQUIRED)
find_package(PhysX REQUIRED) #TODO: Not required if we aren't building the client
find_package(PNG REQUIRED)
find_package(Ogg REQUIRED) #TODO: Not required if we aren't building the client
find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client
find_package(Speex REQUIRED) #TODO: Not required if we aren't building the client
Expand Down Expand Up @@ -86,4 +87,4 @@ endif(MSVC)
include_directories(${OPENSSL_INCLUDE_DIR})

add_subdirectory(Sources/Plasma)
add_subdirectory(Sources/Tools)
add_subdirectory(Sources/Tools)
52 changes: 7 additions & 45 deletions Sources/Plasma/Apps/plClient/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${PYTHON_INCLUDE_DIR})
include_directories(${CURL_INCLUDE_DIR})

add_subdirectory(external)

set(plClient_HEADERS
plClient.h
plClientCreatable.h
Expand All @@ -40,59 +42,17 @@ set(plClient_TEXT
set(plClient_RESOURCES
res/plClient.rc
res/resource.h

res/banner.bmp
res/bitmap1.bmp
res/bitmap2.bmp
res/bitmap3.bmp
res/bmp00001.bmp
res/bmp00002.bmp
res/bmp00003.bmp
res/bmp00004.bmp
res/bmp00005.bmp
res/book.bmp
res/book_cli.bmp
res/book_hig.bmp
res/cnsl1.bin
res/cursor_clicked.bmp
res/cursor_disabled.bmp
res/cursor_down.bmp
res/cursor_grab.bmp
res/cursor_left.bmp
res/cursor_open.bmp
res/cursor_poised.bmp
res/cursor_right.bmp
res/cursor_u.bmp
res/cursor_up.bmp
res/cursor_upward.bmp
res/Dirt.ICO
res/headspin.ico
res/Microphone.bmp
res/Speaker.bmp
res/xLoading_Linking.01.jpg
res/xLoading_Linking.02.jpg
res/xLoading_Linking.03.jpg
res/xLoading_Linking.04.jpg
res/xLoading_Linking.05.jpg
res/xLoading_Linking.06.jpg
res/xLoading_Linking.07.jpg
res/xLoading_Linking.08.jpg
res/xLoading_Linking.09.jpg
res/xLoading_Linking.10.jpg
res/xLoading_Linking.11.jpg
res/xLoading_Linking.12.jpg
res/xLoading_Linking.13.jpg
res/xLoading_Linking.14.jpg
res/xLoading_Linking.15.jpg
res/xLoading_Linking.16.jpg
res/xLoading_Linking.17.jpg
res/xLoading_Linking.18.jpg
res/xLoading_Linking_Text.jpg
res/xLoading_Updating_Text.jpg
)

add_executable(plClient WIN32 ${plClient_SOURCES} ${plClient_HEADERS}
${plClient_TEXT} ${plClient_RESOURCES})

add_dependencies(plClient externalResources)

if(PLASMA_EXTERNAL_RELEASE)
set_target_properties(plClient PROPERTIES OUTPUT_NAME "UruExplorer")
endif(PLASMA_EXTERNAL_RELEASE)
Expand Down Expand Up @@ -123,6 +83,7 @@ target_link_libraries(plClient plAudible)
target_link_libraries(plClient plAudio)
target_link_libraries(plClient plAudioCore)
target_link_libraries(plClient plAvatar)
target_link_libraries(plClient plClientResMgr)
#target_link_libraries(plClient plClientKey)
target_link_libraries(plClient plCompression)
target_link_libraries(plClient plContainer)
Expand Down Expand Up @@ -198,6 +159,7 @@ target_link_libraries(plClient ${OPENAL_LIBRARY})
target_link_libraries(plClient ${OPENSSL_LIBRARIES})
target_link_libraries(plClient ${EXPAT_LIBRARY})
target_link_libraries(plClient ${JPEG_LIBRARY})
target_link_libraries(plClient ${PNG_LIBRARY})
target_link_libraries(plClient ${Speex_LIBRARY})
target_link_libraries(plClient ${PHYSX_LIBRARIES})
target_link_libraries(plClient ${Ogg_LIBRARIES})
Expand Down
30 changes: 30 additions & 0 deletions Sources/Plasma/Apps/plClient/external/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
set(external_SCRIPTS
makeres.py
render_svg.py
create_resource_dat.py
)

set(external_SOURCES
Cursor_Base.svg
Linking_Book.svg
Loading_Text_rasterfont.svg
Voice_Chat.svg
)

if(PLASMA_EXTERNAL_RELEASE)
set(Make_Resource_Command
python ${CMAKE_CURRENT_SOURCE_DIR}/makeres.py --optimize --render --package -i ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_CURRENT_BINARY_DIR})
else(PLASMA_EXTERNAL_RELEASE)
set(Make_Resource_Command
python ${CMAKE_CURRENT_SOURCE_DIR}/makeres.py --render --package -i ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_CURRENT_BINARY_DIR})
endif(PLASMA_EXTERNAL_RELEASE)

add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/resource.dat
COMMAND ${Make_Resource_Command}
DEPENDS ${external_SOURCES} ${external_SCRIPTS}
)
add_custom_target(externalResources DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/resource.dat)

source_group("Source Files" FILES ${external_SOURCES})
source_group("Script Files" FILES ${external_SCRIPTS})
Loading