瀏覽代碼

Windows ICO

Josh Engebretson 10 年之前
父節點
當前提交
223518a46f

二進制
CMake/Modules/Atomic.ico


+ 2 - 0
CMake/Modules/Atomic.rc

@@ -0,0 +1,2 @@
+IDR_MAINFRAME ICON "Atomic.ico"
+

二進制
Data/AtomicPlayer/Resources/CoreData/Images/AtomicLogo32.png


+ 1 - 0
Source/AtomicEditor/CMakeLists.txt

@@ -24,6 +24,7 @@ else()
     add_definitions(-DCURL_STATICLIB)
     add_definitions(-DCURL_STATICLIB)
     set (EXE_TYPE WIN32)
     set (EXE_TYPE WIN32)
     set (SOURCE_FILES ${SOURCE_FILES} Vendor/nativefiledialog/nfd_win.cpp Vendor/nativefiledialog/nfd.h)
     set (SOURCE_FILES ${SOURCE_FILES} Vendor/nativefiledialog/nfd_win.cpp Vendor/nativefiledialog/nfd.h)
+    set (SOURCE_FILES ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.rc)
 endif(APPLE)
 endif(APPLE)
 
 
 add_subdirectory(Vendor)
 add_subdirectory(Vendor)

+ 3 - 0
Source/AtomicEditor/Source/AEApplication.cpp

@@ -52,6 +52,7 @@ namespace AtomicEditor
 AEApplication::AEApplication(Context* context) :
 AEApplication::AEApplication(Context* context) :
     Application(context)
     Application(context)
 {
 {
+
 }
 }
 
 
 void AEApplication::Start()
 void AEApplication::Start()
@@ -151,6 +152,8 @@ void AEApplication::Setup()
 
 
 #ifdef __APPLE__
 #ifdef __APPLE__
     engineParameters_["ResourcePrefixPath"] = "../Resources";
     engineParameters_["ResourcePrefixPath"] = "../Resources";
+#else
+     engineParameters_["WindowIcon"] = "Images/AtomicLogo32.png";
 #endif
 #endif
 
 
     engineParameters_["LogName"] = filesystem->GetAppPreferencesDir("AtomicEditor", "Logs") + "AtomicEditor.log";
     engineParameters_["LogName"] = filesystem->GetAppPreferencesDir("AtomicEditor", "Logs") + "AtomicEditor.log";

+ 1 - 0
Source/AtomicPlayer/AtomicPlayer.cpp

@@ -77,6 +77,7 @@ void AtomicPlayer::Setup()
 #endif
 #endif
 
 
 #if ATOMIC_PLATFORM_WINDOWS
 #if ATOMIC_PLATFORM_WINDOWS
+    engineParameters_["WindowIcon"] = "Images/AtomicLogo32.png";
     engineParameters_["ResourcePrefixPath"] = "AtomicPlayer_Resources";
     engineParameters_["ResourcePrefixPath"] = "AtomicPlayer_Resources";
 #elif ATOMIC_PLATFORM_ANDROID
 #elif ATOMIC_PLATFORM_ANDROID
     //engineParameters_["ResourcePrefixPath"] = "assets";
     //engineParameters_["ResourcePrefixPath"] = "assets";

+ 1 - 0
Source/AtomicPlayer/CMakeLists.txt

@@ -7,6 +7,7 @@ file (GLOB SOURCE_FILES *.cpp *.h )
 
 
 if (MSVC)
 if (MSVC)
     set (EXE_TYPE WIN32)
     set (EXE_TYPE WIN32)
+    set (SOURCE_FILES ${SOURCE_FILES} ${CMAKE_SOURCE_DIR}/CMake/Modules/Atomic.rc)
 elseif(APPLE)
 elseif(APPLE)
     #ICNS
     #ICNS
     set(MACOSX_BUNDLE_ICON_FILE Atomic.icns)
     set(MACOSX_BUNDLE_ICON_FILE Atomic.icns)