etlegacy/Update-Installer
0
0
Fork 0
mirror of https://github.com/etlegacy/Update-Installer.git synced 2025-02-17 00:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make the GTK development libraries a build requirement on Linux and remove the ENABLE_GTK #ifdefs in main.cpp

Browse source
This commit is contained in:
Robert Knight 2011-08-31 12:44:03 +01:00
parent cb412f4619
commit cc387031d7
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/CMakeLists.txt
View file

@ -11,12 +11,13 @@ endif()
include(UsePkgConfig)
pkgconfig(gtk+-2.0 GTK2_INCLUDE_DIR GTK2_LINK_DIR GTK2_LINK_FLAGS GTK2_CFLAGS)
option(ENABLE_GTK ON)
if (UNIX AND NOT APPLE)
set(LINUX TRUE)
endif()
if (ENABLE_GTK)
if (LINUX)
include_directories(${GTK2_INCLUDE_DIR})
add_definitions(${GTK2_CFLAGS})
add_definitions(-DENABLE_GTK)
add_library(updatergtk SHARED UpdateDialogGtk.cpp UpdateDialogGtk.h)
target_link_libraries(updatergtk ${GTK2_LINK_FLAGS})
endif()
@ -64,7 +65,7 @@ if (UNIX)
set(SOURCES ${SOURCES} UpdateDialogAscii.cpp)
endif()
if (ENABLE_GTK)
if (LINUX)
# embed the GTK helper library into the updater binary.
# At runtime it will be extracted and loaded if the
# GTK libraries are available

9
src/main.cpp
View file

@ -9,9 +9,7 @@
#include "tinythread.h"
#if defined(PLATFORM_LINUX)
#if defined(ENABLE_GTK)
#include "UpdateDialogGtkWrapper.h"
#endif
#include "UpdateDialogGtkWrapper.h"
#include "UpdateDialogAscii.h"
#endif
@ -99,7 +97,6 @@ int main(int argc, char** argv)
#ifdef PLATFORM_LINUX
void runWithUi(int argc, char** argv, UpdateInstaller* installer)
{
#ifdef ENABLE_GTK
UpdateDialogAscii asciiDialog;
UpdateDialogGtkWrapper dialog;
bool useGtk = dialog.init(argc,argv);
@ -118,10 +115,6 @@ void runWithUi(int argc, char** argv, UpdateInstaller* installer)
dialog.exec();
}
updaterThread.join();
#else
// no UI available - do a silent install
installer->run();
#endif
}
#endif