Revision: 77048
http://sourceforge.net/p/brlcad/code/77048
Author: starseeker
Date: 2020-09-04 01:43:55 +0000 (Fri, 04 Sep 2020)
Log Message:
-----------
If I'm understanding this correctly, the WiX msi installer relies on the
application to provide the icon, unlike NSIS. Do what wish.exe does and try
specifying rc files that identify the icons.
Modified Paths:
--------------
brlcad/trunk/src/archer/CMakeLists.txt
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/rtwizard/CMakeLists.txt
Added Paths:
-----------
brlcad/trunk/src/archer/archer.ico
brlcad/trunk/src/archer/archer.rc
brlcad/trunk/src/mged/mged.ico
brlcad/trunk/src/mged/mged.rc
brlcad/trunk/src/rtwizard/rtwizard.ico
brlcad/trunk/src/rtwizard/rtwizard.rc
Modified: brlcad/trunk/src/archer/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/archer/CMakeLists.txt 2020-09-03 22:42:36 UTC (rev
77047)
+++ brlcad/trunk/src/archer/CMakeLists.txt 2020-09-04 01:43:55 UTC (rev
77048)
@@ -16,7 +16,14 @@
# If/when we add MGED's ability to work in "classic" mode, Archer will have
# to be built as a non-GUI application (or we'll have to build two executables)
if(BRLCAD_ENABLE_TK)
- BRLCAD_ADDEXEC(archer archer.c "${archer_libs}" GUI)
+ set(archer_srcs archer.c)
+ if (HAVE_WINDOWS_H)
+ # To associate an icon with the application for Windows (needed
+ # for the WiX installer) we must use an rc file.
+ enable_language(RC)
+ set(archer_srcs ${archer_srcs} archer.rc)
+ endif (HAVE_WINDOWS_H)
+ BRLCAD_ADDEXEC(archer "${archer_srcs}" "${archer_libs}" GUI)
add_dependencies(archer archer_launch_tcl_cp)
add_dependencies(archer rtwizard)
ADD_TARGET_DEPS(archer Tkhtml Tktable itcl_pkgIndex itk_pkgIndex dm_plugins)
@@ -73,6 +80,8 @@
CMakeLists.txt
TODO
archer.c
+ archer.rc
+ archer.ico
)
CMAKEFILES(${archer_ignore_files})
Added: brlcad/trunk/src/archer/archer.ico
===================================================================
(Binary files differ)
Index: brlcad/trunk/src/archer/archer.ico
===================================================================
--- brlcad/trunk/src/archer/archer.ico 2020-09-03 22:42:36 UTC (rev 77047)
+++ brlcad/trunk/src/archer/archer.ico 2020-09-04 01:43:55 UTC (rev 77048)
Property changes on: brlcad/trunk/src/archer/archer.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/x-icon
\ No newline at end of property
Added: brlcad/trunk/src/archer/archer.rc
===================================================================
--- brlcad/trunk/src/archer/archer.rc (rev 0)
+++ brlcad/trunk/src/archer/archer.rc 2020-09-04 01:43:55 UTC (rev 77048)
@@ -0,0 +1,11 @@
+#include <windows.h>
+
+//
+// Icon
+//
+// The icon whose name or resource ID is lexigraphically first, is used
+// as the application's icon.
+//
+
+app ICON DISCARDABLE "archer.ico"
+
Property changes on: brlcad/trunk/src/archer/archer.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2020-09-03 22:42:36 UTC (rev
77047)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2020-09-04 01:43:55 UTC (rev
77048)
@@ -46,6 +46,14 @@
wdb_obj.c
)
+if (HAVE_WINDOWS_H)
+ # To associate an icon with the application for Windows (needed
+ # for the WiX installer) we must use an rc file.
+ enable_language(RC)
+ set(MGED_SOURCES ${MGED_SOURCES } mged.rc)
+endif (HAVE_WINDOWS_H)
+
+
set(mged_libs libtclcad libged libwdb libdm libnmg ${ITCL_LIBRARY}
${ITK_LIBRARY} ${WS2_32_LIBRARY} ${OPENGL32_LIBRARY})
if(TARGET libtermio)
set(mged_libs ${mged_libs} libtermio)
@@ -123,6 +131,8 @@
scroll.h
sedit.h
titles.h
+ mged.ico
+ mged.rc
)
CMAKEFILES(${mged_ignore_files})
Added: brlcad/trunk/src/mged/mged.ico
===================================================================
(Binary files differ)
Index: brlcad/trunk/src/mged/mged.ico
===================================================================
--- brlcad/trunk/src/mged/mged.ico 2020-09-03 22:42:36 UTC (rev 77047)
+++ brlcad/trunk/src/mged/mged.ico 2020-09-04 01:43:55 UTC (rev 77048)
Property changes on: brlcad/trunk/src/mged/mged.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/x-icon
\ No newline at end of property
Added: brlcad/trunk/src/mged/mged.rc
===================================================================
--- brlcad/trunk/src/mged/mged.rc (rev 0)
+++ brlcad/trunk/src/mged/mged.rc 2020-09-04 01:43:55 UTC (rev 77048)
@@ -0,0 +1,11 @@
+#include <windows.h>
+
+//
+// Icon
+//
+// The icon whose name or resource ID is lexigraphically first, is used
+// as the application's icon.
+//
+
+app ICON DISCARDABLE "mged.ico"
+
Property changes on: brlcad/trunk/src/mged/mged.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: brlcad/trunk/src/rtwizard/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-09-03 22:42:36 UTC (rev
77047)
+++ brlcad/trunk/src/rtwizard/CMakeLists.txt 2020-09-04 01:43:55 UTC (rev
77048)
@@ -12,6 +12,14 @@
main.c
)
+ if (HAVE_WINDOWS_H)
+ # To associate an icon with the application for Windows (needed
+ # for the WiX installer) we must use an rc file.
+ enable_language(RC)
+ set(RTWIZARD_SRCS ${RTWIZARD_SRCS} rtwizard.rc)
+ endif (HAVE_WINDOWS_H)
+
+
BRLCAD_ADDEXEC(rtwizard "${RTWIZARD_SRCS}"
"libtclcad;librt;libdm;liboptical;libicv;${ITCL_LIBRARY};${ITK_LIBRARY};${CMAKE_THREAD_LIBS_INIT};${M_LIBRARY}")
ADD_TARGET_DEPS(rtwizard rt rtedge fbserv fb-png fb-pix fbclear fblabel
fbfree fbline fb-fb pix-bw bwmod bw-pix pixmatte pix-fb tkpng dm_plugins)
foreach(item ${tclindex_target_list})
@@ -31,6 +39,8 @@
CMAKEFILES(
CMakeLists.txt
main.c
+ rtwizard.rc
+ rtwizard.ico
)
# Local Variables:
Added: brlcad/trunk/src/rtwizard/rtwizard.ico
===================================================================
(Binary files differ)
Index: brlcad/trunk/src/rtwizard/rtwizard.ico
===================================================================
--- brlcad/trunk/src/rtwizard/rtwizard.ico 2020-09-03 22:42:36 UTC (rev
77047)
+++ brlcad/trunk/src/rtwizard/rtwizard.ico 2020-09-04 01:43:55 UTC (rev
77048)
Property changes on: brlcad/trunk/src/rtwizard/rtwizard.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/x-icon
\ No newline at end of property
Added: brlcad/trunk/src/rtwizard/rtwizard.rc
===================================================================
--- brlcad/trunk/src/rtwizard/rtwizard.rc (rev 0)
+++ brlcad/trunk/src/rtwizard/rtwizard.rc 2020-09-04 01:43:55 UTC (rev
77048)
@@ -0,0 +1,11 @@
+#include <windows.h>
+
+//
+// Icon
+//
+// The icon whose name or resource ID is lexigraphically first, is used
+// as the application's icon.
+//
+
+app ICON DISCARDABLE "rtwizard.ico"
+
Property changes on: brlcad/trunk/src/rtwizard/rtwizard.rc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+CRLF
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
