Skip to content

Link x11 dependency and mkdir obj #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ColinKinloch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Link x11 dependency and mkdir obj #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions phoenix/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 6 additions & 3 deletions vgm2pre/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down