From 0fdbfe8ea83dbf105c6019994c9c502ed3a72e13 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 22 May 2013 12:39:27 -0700 Subject: [PATCH 1/2] move gen_stars to the tools folder --- {interface/resources => tools}/gen_stars.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {interface/resources => tools}/gen_stars.py (100%) diff --git a/interface/resources/gen_stars.py b/tools/gen_stars.py similarity index 100% rename from interface/resources/gen_stars.py rename to tools/gen_stars.py From 62cf452e3dfea1cbe22b6c2610a1d220e5cfb901 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 22 May 2013 13:16:55 -0700 Subject: [PATCH 2/2] non-DRY fix for correct copy of resources for OS X bundle --- interface/CMakeLists.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 621942249f..35eb70bdfc 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -44,15 +44,18 @@ add_subdirectory(src/starfield) if (APPLE) # set how the icon shows up in the Info.plist file SET(MACOSX_BUNDLE_ICON_FILE interface.icns) - - # grab the image and audio files - FILE(GLOB INTERFACE_RES_DIRS resources/*) - set(INTERFACE_RSRCS ${INTERFACE_RES_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/interface.icns) - + # set where in the bundle to put the resources file - SET_SOURCE_FILES_PROPERTIES(${INTERFACE_RSRCS} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - # include the icns file and resource files in the target - SET(INTERFACE_SRCS ${INTERFACE_SRCS} ${INTERFACE_RSRCS}) + SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/interface.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) + + # grab the directories in resources and put them in the right spot in Resources + FILE(GLOB INTERFACE_IMAGES resources/images/*) + SET_SOURCE_FILES_PROPERTIES(${INTERFACE_IMAGES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/images) + + FILE(GLOB INTERFACE_SHADERS resources/shaders/*) + SET_SOURCE_FILES_PROPERTIES(${INTERFACE_SHADERS} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/shaders) + + SET(INTERFACE_SRCS ${INTERFACE_SRCS} ${INTERFACE_IMAGES} ${INTERFACE_SHADERS} ${CMAKE_CURRENT_SOURCE_DIR}/interface.icns) endif (APPLE) find_package(Qt4 REQUIRED QtCore QtGui QtOpenGL)