try add ico to moview

irov · Jul 20, 2018 · f68fe04 · f68fe04
1 parent 0bb1dfd
commit f68fe04
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 1 deletion.
diff --git a/src/movie_transformation.c b/src/movie_transformation.c
@@ -179,7 +179,7 @@ AE_INTERNAL ae_float_t __get_movie_layer_transformation_property( ae_constvoidpt
             ae_float_t block_end = property_ae_float_t[1];
 
             ae_uint32_t block_index = _index - property_index;
-            ae_float_t block_index_f = index256_to_float[block_index];
+            const ae_float_t block_index_f = index256_to_float[block_index];
 
             ae_float_t block_t = block_index_f * block_inv;
 

diff --git a/tools/moview/CMakeLists.txt b/tools/moview/CMakeLists.txt
@@ -70,9 +70,25 @@ if(UNIX AND NOT APPLE)
 	LINK_DIRECTORIES(${GTK3_LIBRARY_DIRS})
 endif()
 
+set(resources_sources )
+
+if(WIN32)
+    if(MINGW)
+        # resource compilation for mingw
+        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/moview_rc.o
+                           COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR}/src
+                                               -i${CMAKE_CURRENT_SOURCE_DIR}/src/moview.rc
+                                               -o ${CMAKE_CURRENT_BINARY_DIR}/moview_rc.o)
+        set(resources_sources ${resources_sources} ${CMAKE_CURRENT_BINARY_DIR}/moview_rc.o)
+    else()
+        set(resources_sources ${resources_sources} ${CMAKE_CURRENT_SOURCE_DIR}/src/moview.rc)
+    endif()
+endif()
+
 add_executable(${PROJECT_NAME}	
 	${files_headers} 
 	${files_sources}
+    ${resources_sources}
 )
 
 if(UNIX AND NOT APPLE)

diff --git a/tools/moview/src/moview.ico b/tools/moview/src/moview.ico
diff --git a/tools/moview/src/moview.rc b/tools/moview/src/moview.rc
@@ -0,0 +1,74 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "WinResrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+GLFW_ICON               ICON                    "moview.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "CompanyName", "libMOVIE"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "libmovie view"
+            VALUE "LegalCopyright", "Copyright (c) 2016-2018, Yuriy Levchenko <[email protected]>"
+            VALUE "ProductName", "moview"
+            VALUE "ProductVersion", "1, 0, 0, 1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+