From 471f1ac526262c92440fc22e6d7b56bb88c9314d Mon Sep 17 00:00:00 2001 From: zvon Date: Fri, 17 Jan 2020 14:19:18 +0100 Subject: [PATCH] Makefile: add stuf for gui in Linux --- Makefile | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index d9518eb..558381b 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ uninstall_gui: tv_rename: functions.o filesystem.o network.o tv_rename.o progress.o main.cpp $(CXX) $(CFLAGS) -o tv_rename main.cpp tv_rename.o functions.o\ - filesystem.o network.o progress.o -lcurl -lsqlite3 + filesystem.o network.o progress.o -lcurl -lsqlite3 filesystem.o: unix/filesystem.cpp $(CXX) $(CFLAGS) -c unix/filesystem.cpp -o filesystem.o @@ -60,11 +60,14 @@ progress.o: progress.cpp .PHONY: gui gui: tv_rename_gui -tv_rename_gui: gui.cpp mainwindow.cpp seasonwindow.cpp databasewindow.cpp network.o\ - functions_gui.o filesystem_u_gui.o tv_rename_gui.o - $(CXX) $(CFLAGS) -o tv_rename_gui gui.cpp mainwindow.cpp seasonwindow.cpp databasewindow.cpp\ - network.o functions_gui.o filesystem_u_gui.o\ - tv_rename_gui.o `pkg-config gtkmm-3.0 --cflags --libs`\ +tv_rename_gui: gui.cpp mainwindow.cpp seasonwindow.cpp databasewindow.cpp\ + network.o functions_gui.o filesystem_u_gui.o tv_rename_gui.o\ + progress.cpp progresswindow.cpp + $(CXX) $(CFLAGS) -o tv_rename_gui gui.cpp mainwindow.cpp seasonwindow.cpp\ + databasewindow.cpp network.o functions_gui.o\ + filesystem_u_gui.o tv_rename_gui.o progress.cpp\ + progresswindow.cpp\ + `pkg-config gtkmm-3.0 --cflags --libs`\ -lcurl -lsqlite3 -DGUI filesystem_u_gui.o: unix/filesystem.cpp @@ -76,12 +79,11 @@ functions_gui.o: functions.cpp tv_rename_gui.o: tv_rename.cpp $(CXX) $(CFLAGS) -c tv_rename.cpp -o tv_rename_gui.o -DGUI - .PHONY: windows windows: tv_rename.exe -tv_rename.exe: tv_rename.cpp functions.cpp windows/filesystem.cpp windows/network.cpp\ - progress.cpp sqlite3.c main.cpp +tv_rename.exe: tv_rename.cpp functions.cpp windows/filesystem.cpp\ + windows/network.cpp progress.cpp sqlite3.c main.cpp $(CXX) -MD -EHsc -Fe"tv_rename" tv_rename.cpp windows/filesystem.cpp\ functions.cpp windows/network.cpp progress.cpp sqlite3.c main.cpp\ -D_WIN32 -DUNICODE -link wininet.lib shlwapi.lib ole32.lib\ @@ -91,11 +93,11 @@ tv_rename.exe: tv_rename.cpp functions.cpp windows/filesystem.cpp windows/networ windows_gui: tv_rename_gui.exe tv_rename_gui.exe: tv_rename_gui.res tv_rename_gui.cpp tv_rename.cpp\ - windows/filesystem.cpp functions.cpp windows/network.cpp + windows/filesystem.cpp functions.cpp windows/network.cpp $(CXX) -MD -EHsc -Fe"tv_rename_gui" tv_rename_gui.cpp tv_rename.cpp\ - windows/filesystem.cpp functions.cpp windows/network.cpp -D_WIN32 -DUNICODE\ - -DGUI -link wininet.lib shlwapi.lib ole32.lib shell32.lib gdi32.lib\ - user32.lib tv_rename_gui.res + windows/filesystem.cpp functions.cpp windows/network.cpp -D_WIN32\ + -DUNICODE -DGUI -link wininet.lib shlwapi.lib ole32.lib shell32.lib\ + gdi32.lib user32.lib tv_rename_gui.res tv_rename_gui.res: tv_rename_gui.rc rc tv_rename_gui.rc