mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 09:58:01 +00:00
Ensure Unix putty and pterm have correct icons.
I noticed that my pterm had the same icon as my putty.
This commit is contained in:
parent
2985383c0b
commit
176f01ea7c
@ -19,14 +19,16 @@ add_sources_from_current_dir(utils
|
|||||||
utils/pollwrap.c
|
utils/pollwrap.c
|
||||||
utils/signal.c
|
utils/signal.c
|
||||||
utils/x11_ignore_error.c
|
utils/x11_ignore_error.c
|
||||||
# Compiled icon pixmap files
|
|
||||||
putty-xpm.c
|
|
||||||
putty-config-xpm.c
|
|
||||||
pterm-xpm.c
|
|
||||||
pterm-config-xpm.c
|
|
||||||
# We want the ISO C implementation of ltime(), because we don't have
|
# We want the ISO C implementation of ltime(), because we don't have
|
||||||
# a local better alternative
|
# a local better alternative
|
||||||
../utils/ltime.c)
|
../utils/ltime.c)
|
||||||
|
# Compiled icon pixmap files
|
||||||
|
add_library(puttyxpms STATIC
|
||||||
|
putty-xpm.c
|
||||||
|
putty-config-xpm.c)
|
||||||
|
add_library(ptermxpms STATIC
|
||||||
|
pterm-xpm.c
|
||||||
|
pterm-config-xpm.c)
|
||||||
add_sources_from_current_dir(eventloop
|
add_sources_from_current_dir(eventloop
|
||||||
cliloop.c uxsel.c)
|
cliloop.c uxsel.c)
|
||||||
add_sources_from_current_dir(console
|
add_sources_from_current_dir(console
|
||||||
@ -152,7 +154,7 @@ if(GTK_FOUND)
|
|||||||
pty.c)
|
pty.c)
|
||||||
be_list(pterm pterm)
|
be_list(pterm pterm)
|
||||||
target_link_libraries(pterm
|
target_link_libraries(pterm
|
||||||
guiterminal eventloop settings charset utils
|
guiterminal eventloop settings charset utils ptermxpms
|
||||||
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
||||||
installed_program(pterm)
|
installed_program(pterm)
|
||||||
|
|
||||||
@ -166,7 +168,7 @@ if(GTK_FOUND)
|
|||||||
pty.c)
|
pty.c)
|
||||||
be_list(ptermapp pterm)
|
be_list(ptermapp pterm)
|
||||||
target_link_libraries(ptermapp
|
target_link_libraries(ptermapp
|
||||||
guiterminal eventloop settings charset utils
|
guiterminal eventloop settings charset utils ptermxpms
|
||||||
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -176,7 +178,7 @@ if(GTK_FOUND)
|
|||||||
be_list(putty PuTTY SSH SERIAL OTHERBACKENDS)
|
be_list(putty PuTTY SSH SERIAL OTHERBACKENDS)
|
||||||
target_link_libraries(putty
|
target_link_libraries(putty
|
||||||
guiterminal eventloop sshclient otherbackends settings
|
guiterminal eventloop sshclient otherbackends settings
|
||||||
network crypto charset utils
|
network crypto charset utils puttyxpms
|
||||||
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
||||||
set_target_properties(putty
|
set_target_properties(putty
|
||||||
PROPERTIES LINK_INTERFACE_MULTIPLICITY 2)
|
PROPERTIES LINK_INTERFACE_MULTIPLICITY 2)
|
||||||
@ -190,7 +192,7 @@ if(GTK_FOUND)
|
|||||||
be_list(puttyapp PuTTY SSH SERIAL OTHERBACKENDS)
|
be_list(puttyapp PuTTY SSH SERIAL OTHERBACKENDS)
|
||||||
target_link_libraries(puttyapp
|
target_link_libraries(puttyapp
|
||||||
guiterminal eventloop sshclient otherbackends settings
|
guiterminal eventloop sshclient otherbackends settings
|
||||||
network crypto charset utils
|
network crypto charset utils puttyxpms
|
||||||
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -204,5 +206,6 @@ if(GTK_FOUND)
|
|||||||
be_list(puttytel PuTTYtel SERIAL OTHERBACKENDS)
|
be_list(puttytel PuTTYtel SERIAL OTHERBACKENDS)
|
||||||
target_link_libraries(puttytel
|
target_link_libraries(puttytel
|
||||||
guiterminal eventloop otherbackends settings network charset utils
|
guiterminal eventloop otherbackends settings network charset utils
|
||||||
|
puttyxpms
|
||||||
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
${GTK_LIBRARIES} ${X11_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user