From ff33680e5c10ce26763cf5d690df1fa25d7e8d36 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Wed, 5 Jan 2011 18:55:33 +0000 Subject: [PATCH] cmake: use absolute path for resources file. (issue 930) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4178 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/CMakeLists.txt | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index a4cc5f4124..ec82f389f9 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -109,7 +109,7 @@ else(Subversion_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.svn") file(WRITE ${CMAKE_BINARY_DIR}/pcsx2/svnrev.h "#define SVN_REV 0 \n#define SVN_MODS 0") endif(Subversion_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.svn") -# variable with sources of this executable +# Main pcsx2 source set(pcsx2Sources Cache.cpp COP0.cpp @@ -177,7 +177,7 @@ set(pcsx2Sources VUmicroMem.cpp VUops.cpp) -# variable with sources of this executable +# Main pcsx2 header set(pcsx2Headers Cache.h cheatscpp.h @@ -363,6 +363,8 @@ set(pcsx2GuiHeaders gui/RecentIsoList.h ) +# 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(pcsx2GuiResources gui/Resources/AppIcon16.h @@ -638,20 +640,20 @@ add_executable(${Output} ${Platform}) # Generate the resources files -add_custom_command(OUTPUT "gui/Resources/AppIcon16.h" COMMAND bin2cpp "gui/Resources/AppIcon16.png") -add_custom_command(OUTPUT "gui/Resources/AppIcon32.h" COMMAND bin2cpp "gui/Resources/AppIcon32.png") -add_custom_command(OUTPUT "gui/Resources/AppIcon64.h" COMMAND bin2cpp "gui/Resources/AppIcon64.png") -add_custom_command(OUTPUT "gui/Resources/BackgroundLogo.h" COMMAND bin2cpp "gui/Resources/BackgroundLogo.png") -add_custom_command(OUTPUT "gui/Resources/ButtonIcon_Camera.h" COMMAND bin2cpp "gui/Resources/ButtonIcon_Camera.png") -add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Appearance.h" COMMAND bin2cpp "gui/Resources/ConfigIcon_Appearance.png") -add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Cpu.h" COMMAND bin2cpp "gui/Resources/ConfigIcon_Cpu.png") -add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Gamefixes.h" COMMAND bin2cpp "gui/Resources/ConfigIcon_Gamefixes.png") -add_custom_command(OUTPUT "gui/Resources/ConfigIcon_MemoryCard.h" COMMAND bin2cpp "gui/Resources/ConfigIcon_MemoryCard.png") -add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Paths.h" COMMAND bin2cpp "gui/Resources/ConfigIcon_Paths.png") -add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Plugins.h" COMMAND bin2cpp "gui/Resources/ConfigIcon_Plugins.png") -add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Speedhacks.h" COMMAND bin2cpp "gui/Resources/ConfigIcon_Speedhacks.png") -add_custom_command(OUTPUT "gui/Resources/ConfigIcon_Video.h" COMMAND bin2cpp "gui/Resources/ConfigIcon_Video.png") -add_custom_command(OUTPUT "gui/Resources/Dualshock.h" COMMAND bin2cpp "gui/Resources/Dualshock.jpg") +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") # link target with project internal libraries target_link_libraries(${Output} Utilities x86emitter)