zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Control libslvs compilation from src/Makefile.am

pull/3/head
Roland Lutz 2015-03-02 19:20:12 +01:00
parent 413ab5f578
commit ae37fb783e
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
exposed/Makefile.am
View File

@ -2,28 +2,14 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = -DLIBRARY -I$(top_srcdir)/src -I$(top_srcdir)/include AM_CPPFLAGS = -I$(top_srcdir)/include
AM_LDFLAGS = -L. AM_LDFLAGS = -L../src
noinst_PROGRAMS = CDemo noinst_PROGRAMS = CDemo
noinst_LIBRARIES = libslvs.a
CDemo_SOURCES = CDemo.c CDemo_SOURCES = CDemo.c
# Set explicit CPPFLAGS to force renaming of the object files.
# Otherwise, the object files for the GUI application will be overwritten.
libslvs_a_CPPFLAGS = $(AM_CPPFLAGS)
libslvs_a_SOURCES = \
lib.cpp \
../src/util.cpp \
../src/entity.cpp \
../src/expr.cpp \
../src/constraint.cpp \
../src/constrainteq.cpp \
../src/system.cpp
CDemo_LDADD = CDemo_LDADD =
if HAVE_FLTK if HAVE_FLTK

12
src/Makefile.am
View File

@ -2,6 +2,18 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
noinst_LIBRARIES = libslvs.a
libslvs_a_SOURCES = \
../exposed/lib.cpp \
util.cpp \
entity.cpp \
expr.cpp \
constraint.cpp \
constrainteq.cpp \
system.cpp
libslvs_a_CPPFLAGS = -DLIBRARY -I$(top_srcdir)/include
AM_CPPFLAGS = $(FLTK_CXXFLAGS) $(LIBSPNAV_CPPFLAGS) AM_CPPFLAGS = $(FLTK_CXXFLAGS) $(LIBSPNAV_CPPFLAGS)
if WIN32 if WIN32