diff --git a/phoenix/Makefile b/phoenix/Makefile index 957e361..088940c 100644 --- a/phoenix/Makefile +++ b/phoenix/Makefile @@ -13,8 +13,8 @@ else endif ifeq ($(phoenix),gtk) - phoenixflags = $(cppflags) $(flags) -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0` - phoenixlink = `pkg-config --libs gtk+-2.0` + phoenixflags = $(cppflags) $(flags) -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0 x11` + phoenixlink = `pkg-config --libs gtk+-2.0 x11` endif ifeq ($(phoenix),qt) diff --git a/vgm2pre/Makefile b/vgm2pre/Makefile index 3e73109..4ab8274 100644 --- a/vgm2pre/Makefile +++ b/vgm2pre/Makefile @@ -22,15 +22,18 @@ all: $(objects) #obj/resource.o: ../phoenix/windows/phoenix.rc # windres ../phoenix/windows/phoenix.rc obj/resource.o -obj/resource.o: app.rc +obj/resource.o: app.rc obj windres $(rlink) app.rc obj/resource.o -obj/phoenix.o: ../phoenix/phoenix.cpp +obj/phoenix.o: ../phoenix/phoenix.cpp obj $(compiler) $(phoenixflags) -o obj/phoenix.o -c ../phoenix/phoenix.cpp -obj/$(application).o: $(application).cpp *.cpp *.hpp ui/*.hpp +obj/$(application).o: $(application).cpp *.cpp *.hpp ui/*.hpp obj $(compiler) $(cppflags) $(flags) -o obj/$(application).o -c $(application).cpp +obj: + mkdir $@ + install: sudo cp $(application) /usr/local/bin/$(application)