forked from Mirrors/openclonk
Fix typo previous rev c18fa35abd02 + conditionally exclude C4UpdateDlg.h/cpp from build
parent
14251a7a31
commit
bb78ea79e7
|
@ -370,8 +370,6 @@ set(OC_CLONK_SOURCES
|
||||||
src/gui/C4StartupPlrSelDlg.h
|
src/gui/C4StartupPlrSelDlg.h
|
||||||
src/gui/C4StartupScenSelDlg.cpp
|
src/gui/C4StartupScenSelDlg.cpp
|
||||||
src/gui/C4StartupScenSelDlg.h
|
src/gui/C4StartupScenSelDlg.h
|
||||||
src/gui/C4UpdateDlg.cpp
|
|
||||||
src/gui/C4UpdateDlg.h
|
|
||||||
src/gui/C4UpperBoard.cpp
|
src/gui/C4UpperBoard.cpp
|
||||||
src/gui/C4UpperBoard.h
|
src/gui/C4UpperBoard.h
|
||||||
src/gui/C4UserMessages.h
|
src/gui/C4UserMessages.h
|
||||||
|
@ -653,6 +651,12 @@ if(USE_GTK)
|
||||||
src/editor/C4ConsoleGTK.cpp
|
src/editor/C4ConsoleGTK.cpp
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
if(WITH_AUTOMATIC_UPDATE)
|
||||||
|
list(APPEND OC_CLONK_SOURCES
|
||||||
|
src/gui/C4UpdateDlg.cpp
|
||||||
|
src/gui/C4UpdateDlg.h
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(PROJECT_FOLDERS)
|
if(PROJECT_FOLDERS)
|
||||||
source_group("Core" src/.*)
|
source_group("Core" src/.*)
|
||||||
|
|
|
@ -144,7 +144,7 @@ bool C4Application::DoInit(int argc, char * argv[])
|
||||||
if (!IsResStrTableLoaded())
|
if (!IsResStrTableLoaded())
|
||||||
Log("WARNING: No language string table loaded!");
|
Log("WARNING: No language string table loaded!");
|
||||||
|
|
||||||
#if defined(WIN32) && defined(WITH_AUTOMATIC_UDPATE)
|
#if defined(WIN32) && defined(WITH_AUTOMATIC_UPDATE)
|
||||||
// Windows: handle incoming updates directly, even before starting up the gui
|
// Windows: handle incoming updates directly, even before starting up the gui
|
||||||
// because updates will be applied in the console anyway.
|
// because updates will be applied in the console anyway.
|
||||||
if (Application.IncomingUpdate)
|
if (Application.IncomingUpdate)
|
||||||
|
|
|
@ -20,9 +20,7 @@
|
||||||
* See clonk_trademark_license.txt for full license.
|
* See clonk_trademark_license.txt for full license.
|
||||||
*/
|
*/
|
||||||
// dialogs for update, and the actual update application code
|
// dialogs for update, and the actual update application code
|
||||||
|
// is only compiled WITH_AUTOMATIC_UPDATE
|
||||||
// Don't compile this class if automatic update is disabled
|
|
||||||
#ifdef WITH_AUTOMATIC_UPDATE
|
|
||||||
|
|
||||||
#include "C4Include.h"
|
#include "C4Include.h"
|
||||||
|
|
||||||
|
@ -382,6 +380,3 @@ bool C4UpdateDlg::CheckForUpdates(C4GUI::Screen *pScreen, bool fAutomatic)
|
||||||
// Done (and no update has been done)
|
// Done (and no update has been done)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif // WITH_AUTOMATIC_UPDATE
|
|
||||||
|
|
Loading…
Reference in New Issue