diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | backend.mk | 7 | ||||
| -rw-r--r-- | clock/Makefile | 2 | ||||
| -rw-r--r-- | winnie/Makefile | 2 |
5 files changed, 6 insertions, 9 deletions
diff --git a/.bzrignore b/.bzrignore deleted file mode 100644 index a438335..0000000 --- a/.bzrignore +++ /dev/null @@ -1 +0,0 @@ -*.d diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e3531ad --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.d +*.o +*.so @@ -1,7 +1,2 @@ backend = SDL - -ifeq ($(backend), SDL) - def = -DWINNIE_SDL -else - def = -DWINNIE_FBDEV -endif +def = -DWINNIE_SDL diff --git a/clock/Makefile b/clock/Makefile index 7eba036..6b8c44e 100644 --- a/clock/Makefile +++ b/clock/Makefile @@ -10,7 +10,7 @@ inc = -Isrc -I../libwinnie/src include ../backend.mk CXX = g++ -CXXFLAGS = -pedantic -Wall -Wextra -O2 $(dbg) $(opt) $(inc) $(def) `pkg-config freetype2 --cflags` +CXXFLAGS = -pedantic -Wall -Wextra -O2 $(dbg) $(opt) $(inc) $(def) `pkg-config freetype2 --cflags` -fPIC LDFLAGS = -L../libwinnie/ $(libs) `pkg-config freetype2 --libs` -lrt -lwinnie -ldl $(lib_so): $(obj) diff --git a/winnie/Makefile b/winnie/Makefile index 8e66827..cc24643 100644 --- a/winnie/Makefile +++ b/winnie/Makefile @@ -1,4 +1,4 @@ -src = $(wildcard src/*.cc) $(wildcard src/fbdev/*.cc) $(wildcard src/sdl/*.cc) +src = $(wildcard src/*.cc) $(wildcard src/sdl/*.cc) obj = $(src:.cc=.o) dep = $(obj:.o=.d) bin = wserver |