First attempt at configuration dialog.

[virtualjaguar] / Makefile

diff --git a/Makefile b/Makefile
index 895a0ab29e1202d029c61ca6e8dbb65e8ac47e6e..17385f8d27ea41c29bed43bc99a57629f5869374 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,7 @@
 # file GPL.TXT for details. ;-)
 #
 
-# NOTE: zlib and OpenGL libs are a dependency, but are not checked for.
-#       same goes for libcdio, Qt
+# NOTE: Qt and OpenGL libs are a dependency, but are not checked for.
 
 # Figure out which system we're compiling for, and set the appropriate variables
 
@@ -41,7 +40,7 @@ ICON       :=
 SDLLIBTYPE := --libs
 MSG        := GNU/Linux
 
-else                                                                                   # *nix
+else                                                                                   # ???
 
 $(error OS TYPE UNDETECTED)
 
@@ -83,7 +82,12 @@ OBJS := \
 \
        obj/about.o             \
        obj/app.o               \
-       obj/configwin.o         \
+       obj/configdialog.o      \
+       obj/moc_configdialog.o  \
+       obj/generaltab.o        \
+       obj/moc_generaltab.o    \
+       obj/controllertab.o     \
+       obj/moc_controllertab.o \
        obj/filepicker.o        \
        obj/moc_filepicker.o    \
        obj/filelistmodel.o     \
@@ -129,9 +133,10 @@ OBJS := \
 # Targets for convenience sake, not "real" targets
 .PHONY: clean
 
-all: checkenv message2 obj $(TARGET)$(EXESUFFIX)
+all: checkenv message obj $(TARGET)$(EXESUFFIX)
        @echo
        @echo -e "\033[01;33m***\033[00;32m Looks like it compiled OK... Give it a whirl!\033[00m"
+       @echo
 
 # Check the compilation environment, barf if not appropriate
 
@@ -200,7 +205,7 @@ msg-check-env:
        @echo -e "\033[01;33m***\033[00;32m Checking compilation environment: \033[00m"
        @echo
 
-message2:
+message:
        @echo
        @echo -e "\033[01;33m***\033[00;32m Building Virtual Jaguar for $(MSG)...\033[00m"
        @echo