ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: generate resource outside of the source tree. 

Debian: remove useless clean file


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4813 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut@gmail.com 2011-07-17 14:21:09 +00:00
parent e5cedbe9d9
commit 71bff75810
2 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian-unstable-upstream/clean
View File

@ -1,14 +0,0 @@
pcsx2/gui/Resources/ConfigIcon_Cpu.h
pcsx2/gui/Resources/AppIcon32.h
pcsx2/gui/Resources/AppIcon16.h
pcsx2/gui/Resources/ConfigIcon_Paths.h
pcsx2/gui/Resources/ConfigIcon_Video.h
pcsx2/gui/Resources/BackgroundLogo.h
pcsx2/gui/Resources/ConfigIcon_Plugins.h
pcsx2/gui/Resources/AppIcon64.h
pcsx2/gui/Resources/ConfigIcon_Appearance.h
pcsx2/gui/Resources/ConfigIcon_Speedhacks.h
pcsx2/gui/Resources/ConfigIcon_MemoryCard.h
pcsx2/gui/Resources/Dualshock.h
pcsx2/gui/Resources/ConfigIcon_Gamefixes.h
pcsx2/gui/Resources/ButtonIcon_Camera.h

63
pcsx2/CMakeLists.txt
View File

@ -369,21 +369,23 @@ set(pcsx2GuiHeaders
# Warning: the declaration of the .h are mandatory in case of resources files. It will ensure the creation
# from the bin2cpp tools at the good moment (ie .h must be created before the pcsx2 compilation)
# Gui resources headers
set(res_bin "${CMAKE_BINARY_DIR}/pcsx2/gui/Resources")
set(res_src "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources")
set(pcsx2GuiResources
gui/Resources/AppIcon16.h
gui/Resources/AppIcon32.h
gui/Resources/AppIcon64.h
gui/Resources/BackgroundLogo.h
gui/Resources/ConfigIcon_Appearance.h
gui/Resources/ButtonIcon_Camera.h
gui/Resources/ConfigIcon_Cpu.h
gui/Resources/ConfigIcon_Gamefixes.h
gui/Resources/ConfigIcon_MemoryCard.h
gui/Resources/ConfigIcon_Paths.h
gui/Resources/ConfigIcon_Plugins.h
gui/Resources/ConfigIcon_Speedhacks.h
gui/Resources/ConfigIcon_Video.h
gui/Resources/Dualshock.h
${res_bin}/AppIcon16.h
${res_bin}/AppIcon32.h
${res_bin}/AppIcon64.h
${res_bin}/BackgroundLogo.h
${res_bin}/ConfigIcon_Appearance.h
${res_bin}/ButtonIcon_Camera.h
${res_bin}/ConfigIcon_Cpu.h
${res_bin}/ConfigIcon_Gamefixes.h
${res_bin}/ConfigIcon_MemoryCard.h
${res_bin}/ConfigIcon_Paths.h
${res_bin}/ConfigIcon_Plugins.h
${res_bin}/ConfigIcon_Speedhacks.h
${res_bin}/ConfigIcon_Video.h
${res_bin}/Dualshock.h
)
# IPU sources
@ -632,28 +634,29 @@ endif(MacOSX)
include_directories(.
gui
x86
${CMAKE_BINARY_DIR}/pcsx2)
${CMAKE_BINARY_DIR}/pcsx2
${CMAKE_BINARY_DIR}/pcsx2/gui
)
# add executable
add_executable(${Output}
${Common}
${Platform})
# Generate the resources files
add_custom_command(OUTPUT "gui/Resources/AppIcon16.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/AppIcon16.png")
add_custom_command(OUTPUT "gui/Resources/AppIcon32.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/AppIcon32.png")
add_custom_command(OUTPUT "gui/Resources/AppIcon64.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/AppIcon64.png")
add_custom_command(OUTPUT "gui/Resources/BackgroundLogo.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/BackgroundLogo.png")
add_custom_command(OUTPUT "gui/Resources/ButtonIcon_Camera.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/ButtonIcon_Camera.png")
add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Appearance.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/ConfigIcon_Appearance.png")
add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Cpu.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/ConfigIcon_Cpu.png")
add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Gamefixes.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/ConfigIcon_Gamefixes.png")
add_custom_command(OUTPUT "gui/Resources/ConfigIcon_MemoryCard.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/ConfigIcon_MemoryCard.png")
add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Paths.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/ConfigIcon_Paths.png")
add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Plugins.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/ConfigIcon_Plugins.png")
add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Speedhacks.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/ConfigIcon_Speedhacks.png")
add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Video.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/ConfigIcon_Video.png")
add_custom_command(OUTPUT "gui/Resources/Dualshock.h" COMMAND bin2cpp "${PROJECT_SOURCE_DIR}/pcsx2/gui/Resources/Dualshock.jpg")
### Generate the resources files
file(MAKE_DIRECTORY ${res_bin})
add_custom_command(OUTPUT "${res_bin}/Dualshock.h" COMMAND bin2cpp "${res_src}/Dualshock.jpg" "${res_bin}/Dualshock" )
foreach(res_file IN ITEMS
AppIcon16 AppIcon32 AppIcon64 BackgroundLogo ButtonIcon_Camera
ConfigIcon_Appearance ConfigIcon_Cpu ConfigIcon_Gamefixes ConfigIcon_MemoryCard
ConfigIcon_Paths ConfigIcon_Plugins ConfigIcon_Speedhacks ConfigIcon_Video)
add_custom_command(OUTPUT "${res_bin}/${res_file}.h" COMMAND bin2cpp "${res_src}/${res_file}.png" "${res_bin}/${res_file}" )
endforeach(res_file IN ITEMS
AppIcon16 AppIcon32 AppIcon64 BackgroundLogo ButtonIcon_Camera
ConfigIcon_Appearance ConfigIcon_Cpu ConfigIcon_Gamefixes ConfigIcon_MemoryCard
ConfigIcon_Paths ConfigIcon_Plugins ConfigIcon_Speedhacks ConfigIcon_Video)
# link target with project internal libraries
target_link_libraries(${Output} Utilities x86emitter)