Move source files to src/; fix the CI for gtk2

C0rn3j · Nov 11, 2016 · cd81758 · cd81758
1 parent 3f6cffb
commit cd81758
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,2 +1,2 @@
 language: nix
-script: nix-shell --run "make gtk3 && make gtk2"
+script: nix-shell --run "make gtk3 clean && make gtk2"
diff --git a/Makefile b/Makefile
@@ -20,14 +20,14 @@ lyricbar: ui.o utils.o main.o
 	$(if $(LYRICBAR),, $(error You should only access this target via "gtk3" or "gtk2"))
 	$(CXX) -flto -shared main.o ui.o utils.o -o $(LYRICBAR) $(LIBS)
 
-ui.o: ui.cpp
-	$(CXX) ui.cpp -c $(LIBFLAGS) $(CXXFLAGS)
+ui.o: src/ui.cpp
+	$(CXX) src/ui.cpp -c $(LIBFLAGS) $(CXXFLAGS)
 
-utils.o: utils.cpp
-	$(CXX) utils.cpp -c $(LIBFLAGS) $(CXXFLAGS)
+utils.o: src/utils.cpp
+	$(CXX) src/utils.cpp -c $(LIBFLAGS) $(CXXFLAGS)
 
-main.o: main.c
-	$(CC) $(CFLAGS) main.c -c `pkg-config --cflags $(GTK)`
+main.o: src/main.c
+	$(CC) $(CFLAGS) src/main.c -c `pkg-config --cflags $(GTK)`
 
 install:
 	install -d $(prefix)/lib/deadbeef

diff --git a/default.nix b/default.nix
@@ -1,11 +1,13 @@
 with import <nixpkgs> {}; {
-  sdlEnv = stdenv.mkDerivation {
+  lyricbar = stdenv.mkDerivation {
     name = "deadbeef-lyricbar";
     buildInputs = [
       stdenv
       pkgconfig
       gettext
+      gnome2.gtkmm
       gnome3.gtkmm
+      gnome2.gtk
       gnome3.gtk
       deadbeef
       libxmlxx3

diff --git a/debug.h → src/debug.h b/debug.h → src/debug.h
diff --git a/gettext.h → src/gettext.h b/gettext.h → src/gettext.h
diff --git a/main.c → src/main.c b/main.c → src/main.c
diff --git a/main.h → src/main.h b/main.h → src/main.h
diff --git a/ui.cpp → src/ui.cpp b/ui.cpp → src/ui.cpp
diff --git a/ui.h → src/ui.h b/ui.h → src/ui.h
diff --git a/utils.cpp → src/utils.cpp b/utils.cpp → src/utils.cpp
diff --git a/utils.h → src/utils.h b/utils.h → src/utils.h