diff options
Diffstat (limited to 'libwinnie')
-rw-r--r-- | libwinnie/Makefile | 10 | ||||
-rw-r--r-- | libwinnie/src/sdl/gfx.cc | 2 | ||||
-rw-r--r-- | libwinnie/src/semaphore.cc | 22 | ||||
-rw-r--r-- | libwinnie/src/semaphore.h | 28 | ||||
-rw-r--r-- | libwinnie/src/text.cc | 2 |
5 files changed, 5 insertions, 59 deletions
diff --git a/libwinnie/Makefile b/libwinnie/Makefile index 763cb59..389757c 100644 --- a/libwinnie/Makefile +++ b/libwinnie/Makefile @@ -1,5 +1,5 @@ PREFIX=/usr/local -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) lib_so = libwinnie.so @@ -10,13 +10,9 @@ inc = -Isrc include ../backend.mk -ifeq ($(backend), SDL) - libs = -lSDL -endif - CXX = g++ -CXXFLAGS = -pedantic -Wall -fPIC $(dbg) $(opt) $(inc) $(def) `freetype-config --cflags` -LDFLAGS = $(libs) `freetype-config --libs` -lrt +CXXFLAGS = -pedantic -Wall $(inc) $(def) `pkg-config freetype2 sdl --cflags --libs` -fPIC +LDFLAGS = $(libs) `pkg-config freetype2 sdl --libs` -lrt -fPIC -ldl $(lib_so): $(obj) $(CXX) -o $@ -shared $(obj) $(LDFLAGS) diff --git a/libwinnie/src/sdl/gfx.cc b/libwinnie/src/sdl/gfx.cc index edce8ba..9f31a4e 100644 --- a/libwinnie/src/sdl/gfx.cc +++ b/libwinnie/src/sdl/gfx.cc @@ -52,7 +52,7 @@ bool init_gfx() get_subsys()->graphics_offset = (int)((char*)gfx - (char*)get_pool()); - Rect scr_rect(0, 0, 1024, 768); + Rect scr_rect(0, 0, 1280, 853); gfx->screen_rect = scr_rect; gfx->color_depth = 32; diff --git a/libwinnie/src/semaphore.cc b/libwinnie/src/semaphore.cc deleted file mode 100644 index d686ba0..0000000 --- a/libwinnie/src/semaphore.cc +++ /dev/null @@ -1,22 +0,0 @@ -/* -winnie - an experimental window system - -Copyright (C) 2013 Eleni Maria Stea - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. - -Author: Eleni Maria Stea <elene.mst@gmail.com> -*/ - -#include "semaphore.h" diff --git a/libwinnie/src/semaphore.h b/libwinnie/src/semaphore.h deleted file mode 100644 index 1ab8920..0000000 --- a/libwinnie/src/semaphore.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -winnie - an experimental window system - -Copyright (C) 2013 Eleni Maria Stea - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. - -Author: Eleni Maria Stea <elene.mst@gmail.com> -*/ - -#ifndef SEMAPHORE_H_ -#define SEMAPHORE_H_ - -bool init_semaphore(); -void destroy_semaphore(); - -#endif // SEMAPHORE_H_ diff --git a/libwinnie/src/text.cc b/libwinnie/src/text.cc index 3d6ab0c..345a857 100644 --- a/libwinnie/src/text.cc +++ b/libwinnie/src/text.cc @@ -28,7 +28,7 @@ Author: Eleni Maria Stea <elene.mst@gmail.com> #include "winnie.h" #define DPI 72 -#define FONT_PATH "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf" +#define FONT_PATH "/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf" #define FONT_SIZE 16 static int draw_glyph(Pixmap *pixmap, int x, int y, char c); |