anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix build on newest MSYS2

Browse source
This commit is contained in:
LAGonauta 2020-05-02 19:42:43 -03:00
parent eb7cf3297c
commit 5f5b8fdfa0
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/PkgConfigWithFallback.cmake
View file

@ -18,7 +18,10 @@ function(find_pkg_config_with_fallback name)
find_library(${name}_${lib}_LIBRARY ${lib} HINTS ${${name}_PKG_CONFIG_LIBRARY_DIRS})
mark_as_advanced(${name}_${lib}_LIBRARY)
if(NOT ${name}_${lib}_LIBRARY)
unset(${name}_FOUND)
find_library(${name}_${lib}_LIBRARY ${lib} HINTS "C:/msys64/mingw64/x86_64-w64-mingw32/lib")
if(NOT ${name}_${lib}_LIBRARY)
unset(${name}_FOUND)
endif(NOT ${name}_${lib}_LIBRARY)
endif(NOT ${name}_${lib}_LIBRARY)
endforeach(lib)
if(${name}_FOUND)

5
cmake/PkgConfigWithFallbackOnConfigScript.cmake
View file

@ -18,7 +18,10 @@ function(find_pkg_config_with_fallback_on_config_script name)
find_library(${name}_${lib}_LIBRARY ${lib} HINTS ${${name}_PKG_CONFIG_LIBRARY_DIRS})
mark_as_advanced(${name}_${lib}_LIBRARY)
if(NOT ${name}_${lib}_LIBRARY)
unset(${name}_FOUND)
find_library(${name}_${lib}_LIBRARY ${lib} HINTS "C:/msys64/mingw64/x86_64-w64-mingw32/lib")
if(NOT ${name}_${lib}_LIBRARY)
unset(${name}_FOUND)
endif(NOT ${name}_${lib}_LIBRARY)
endif(NOT ${name}_${lib}_LIBRARY)
endforeach(lib)
if(${name}_FOUND)

14
main/src/ui/main_window.vala
View file

@ -54,10 +54,16 @@ public class MainWindow : Gtk.Window {
}
private void setup_unified() {
new Dino.Ui.ConversationSelector();
new Dino.Ui.ConversationSummary.ConversationView();
new Dino.Ui.ChatInput.View();
new Dino.Ui.GlobalSearch();
{
new Dino.Ui.ConversationSelector();
new Dino.Ui.ConversationSummary.ConversationView();
new Dino.Ui.ChatInput.View();
new Dino.Ui.GlobalSearch();
new Dino.Ui.ConversationView();
new Dino.Ui.SizeRequestBox();
new Dino.Ui.SizingBin();
}
Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui");
paned = (Paned) builder.get_object("paned");
box.add(paned);