forked from speedie/spmenu
move libdrw stuff
This commit is contained in:
parent
393c24af3c
commit
1126bf5680
6
Makefile
6
Makefile
|
@ -13,7 +13,7 @@ LDFLAGS = $(LIBS)
|
||||||
INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)`
|
INCS = -I$(X11INC) -I$(FREETYPEINC) -I$(BDINC) `pkg-config --cflags $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)`
|
||||||
LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)` $(BDLIBS) $(IMLIB2LIBS)
|
LIBS = -L$(X11LIB) $(X11LIBS) $(XINERAMALIBS) $(FREETYPELIBS) $(XRENDERLIBS) -lm `pkg-config --libs $(XFTCONF) $(PANGOCONF) $(PANGOXFTCONF) $(OPENSSLCONF) $(LIBCONFIGCONF)` $(BDLIBS) $(IMLIB2LIBS)
|
||||||
|
|
||||||
SRC = libs/sl/draw.c spmenu.c libs/sl/main.c
|
SRC = libs/libdrw/draw.c spmenu.c libs/sl/main.c
|
||||||
OBJ = $(SRC:.c=.o)
|
OBJ = $(SRC:.c=.o)
|
||||||
|
|
||||||
all: options spmenu
|
all: options spmenu
|
||||||
|
@ -28,9 +28,9 @@ options:
|
||||||
$(CC) -c $(CFLAGS) -g $<
|
$(CC) -c $(CFLAGS) -g $<
|
||||||
|
|
||||||
|
|
||||||
$(OBJ): options.h libs/sl/draw.h
|
$(OBJ): options.h libs/libdrw/draw.h
|
||||||
|
|
||||||
spmenu: spmenu.o libs/sl/draw.o libs/sl/main.o
|
spmenu: spmenu.o libs/libdrw/draw.o libs/sl/main.o
|
||||||
$(CC) -o $@ spmenu.o draw.o main.o $(LDFLAGS)
|
$(CC) -o $@ spmenu.o draw.o main.o $(LDFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "draw.h"
|
#include "draw.h"
|
||||||
#include "main.h"
|
#include "../sl/main.h"
|
||||||
|
|
||||||
#if !USEPANGO
|
#if !USEPANGO
|
||||||
#define UTF_INVALID 0xFFFD
|
#define UTF_INVALID 0xFFFD
|
2
spmenu.c
2
spmenu.c
|
@ -95,7 +95,7 @@
|
||||||
#include "libs/define.c"
|
#include "libs/define.c"
|
||||||
|
|
||||||
// various headers
|
// various headers
|
||||||
#include "libs/sl/draw.h"
|
#include "libs/libdrw/draw.h"
|
||||||
#include "libs/sl/main.h"
|
#include "libs/sl/main.h"
|
||||||
#include "libs/draw.h"
|
#include "libs/draw.h"
|
||||||
#include "libs/stream.h"
|
#include "libs/stream.h"
|
||||||
|
|
Loading…
Reference in a new issue