diff --git a/CMakeLists.txt b/CMakeLists.txt index 75d11486..534bc881 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,6 +166,13 @@ IF(WIN32) SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -mwindows") ENDIF(CMAKE_COMPILER_IS_GNUCXX) ENDIF(NO_CONSOLE) + + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon.o + COMMAND ${CMAKE_RC_COMPILER} + -I${CMAKE_CURRENT_SOURCE_DIR}/src/otclient/win32icon + -i${CMAKE_CURRENT_SOURCE_DIR}/src/otclient/win32icon/icon.rc + -o ${CMAKE_CURRENT_BINARY_DIR}/icon.o) + SET(SOURCES ${SOURCES} icon.o) ELSE(WIN32) SET(ADDITIONAL_LIBRARIES -lpthread) SET(SOURCES ${SOURCES} src/framework/platform/x11platform.cpp) diff --git a/TODO b/TODO index 0a5d740b..20d005a2 100644 --- a/TODO +++ b/TODO @@ -12,4 +12,5 @@ make otui syntax more like css a real working border and background property in otui load state styles in order grid layout -fix moving windows and tooltips conflicts \ No newline at end of file +fix moving windows and tooltips conflicts +todo display otclient icon in window bar \ No newline at end of file diff --git a/src/otclient/win32icon/icon.ico b/src/otclient/win32icon/icon.ico new file mode 100644 index 00000000..157650f6 Binary files /dev/null and b/src/otclient/win32icon/icon.ico differ diff --git a/src/otclient/win32icon/icon.rc b/src/otclient/win32icon/icon.rc new file mode 100644 index 00000000..328220b9 --- /dev/null +++ b/src/otclient/win32icon/icon.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file