Move library header to include/ directory
parent
2622684ed5
commit
413ab5f578
|
@ -4,13 +4,14 @@ ACLOCAL_AMFLAGS = -I ac-aux
|
||||||
|
|
||||||
SUBDIRS = src exposed
|
SUBDIRS = src exposed
|
||||||
|
|
||||||
|
noinst_HEADERS = include/slvs.h
|
||||||
|
|
||||||
exposed = \
|
exposed = \
|
||||||
exposed/CDemo.c \
|
exposed/CDemo.c \
|
||||||
exposed/DOC.txt \
|
exposed/DOC.txt \
|
||||||
exposed/Makefile \
|
exposed/Makefile \
|
||||||
exposed/VbDemo.vb \
|
exposed/VbDemo.vb \
|
||||||
exposed/lib.cpp \
|
exposed/lib.cpp
|
||||||
exposed/slvs.h
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
$(exposed) \
|
$(exposed) \
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
# include <stdint.h>
|
# include <stdint.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "slvs.h"
|
#include <slvs.h>
|
||||||
|
|
||||||
static Slvs_System sys;
|
static Slvs_System sys;
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = subdir-objects
|
AUTOMAKE_OPTIONS = subdir-objects
|
||||||
|
|
||||||
AM_CPPFLAGS = -DLIBRARY -I$(top_srcdir)/src
|
AM_CPPFLAGS = -DLIBRARY -I$(top_srcdir)/src -I$(top_srcdir)/include
|
||||||
|
|
||||||
AM_LDFLAGS = -L.
|
AM_LDFLAGS = -L.
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@ CDemo_SOURCES = CDemo.c
|
||||||
libslvs_a_CPPFLAGS = $(AM_CPPFLAGS)
|
libslvs_a_CPPFLAGS = $(AM_CPPFLAGS)
|
||||||
|
|
||||||
libslvs_a_SOURCES = \
|
libslvs_a_SOURCES = \
|
||||||
slvs.h \
|
|
||||||
lib.cpp \
|
lib.cpp \
|
||||||
../src/util.cpp \
|
../src/util.cpp \
|
||||||
../src/entity.cpp \
|
../src/entity.cpp \
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#include "solvespace.h"
|
#include "solvespace.h"
|
||||||
#define EXPORT_DLL
|
#define EXPORT_DLL
|
||||||
#include "slvs.h"
|
#include <slvs.h>
|
||||||
|
|
||||||
Sketch SK;
|
Sketch SK;
|
||||||
static System SYS;
|
static System SYS;
|
||||||
|
|
Loading…
Reference in New Issue