Browse Source

Adding Editor and Player icons

Josh Engebretson 10 years ago
parent
commit
8ec1a1af90

BIN
CMake/Modules/Atomic.icns


+ 7 - 1
Source/AtomicEditor/CMakeLists.txt

@@ -14,6 +14,11 @@ set (SOURCE_FILES ${SOURCE_FILES} Vendor/nativefiledialog/nfd_common.c)
 if (APPLE)
     set (EXE_TYPE MACOSX_BUNDLE)
     set (SOURCE_FILES ${SOURCE_FILES} Source/Build/BuildIOSUtils.mm Vendor/nativefiledialog/nfd_cocoa.mm Vendor/nativefiledialog/nfd.h)
+
+    #ICNS
+    set(MACOSX_BUNDLE_ICON_FILE Atomic.icns)
+    set(ATOMIC_EDITOR_ICON ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.icns)
+    set_source_files_properties(${ATOMIC_EDITOR_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")    
 else()
     include_directories (${CMAKE_CURRENT_SOURCE_DIR}/Vendor/libcurl/include)
     add_definitions(-DCURL_STATICLIB)
@@ -23,11 +28,12 @@ endif(APPLE)
 
 add_subdirectory(Vendor)
 
-add_executable(AtomicEditor ${EXE_TYPE} ${SOURCE_FILES})
+add_executable(AtomicEditor ${EXE_TYPE} ${SOURCE_FILES} ${ATOMIC_EDITOR_ICON})
 
 target_link_libraries(AtomicEditor ${ATOMIC_LINK_LIBRARIES} Poco)
 
 if (APPLE)
+    
     set (TARGET_PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.template)
     target_link_libraries(AtomicEditor curl)
 else()

+ 7 - 3
Source/AtomicPlayer/CMakeLists.txt

@@ -7,15 +7,19 @@ file (GLOB SOURCE_FILES *.cpp *.h )
 
 if (MSVC)
     set (EXE_TYPE WIN32)
-else()
-    set (EXE_TYPE MACOSX_BUNDLE)
+elseif(APPLE)
+    #ICNS
+    set(MACOSX_BUNDLE_ICON_FILE Atomic.icns)
+    set(ATOMIC_EDITOR_ICON ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.icns)
+    set_source_files_properties(${ATOMIC_EDITOR_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+    set (EXE_TYPE MACOSX_BUNDLE)    
 endif()
 
 if (ANDROID)
 	include_directories(${CMAKE_SOURCE_DIR}/Source/ThirdParty/SDL/include)
 	add_library(AtomicPlayer SHARED ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/Source/ThirdParty/SDL/src/main/android/SDL_android_main.c)
 else()
-	add_executable(AtomicPlayer ${EXE_TYPE} ${SOURCE_FILES})
+	add_executable(AtomicPlayer ${EXE_TYPE} ${SOURCE_FILES} ${ATOMIC_EDITOR_ICON})
 endif()
 
 target_link_libraries(AtomicPlayer ${ATOMIC_LINK_LIBRARIES})