Remove all legacy buildsystems.
whitequark
parent
3a42a8d8cb
commit
7c7ac17e4b
40
Makefile.am
40
Makefile.am
|
|
@ -1,40 +0,0 @@
|
|||
## Makefile.am
|
||||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = src exposed
|
||||
|
||||
noinst_HEADERS = include/slvs.h
|
||||
|
||||
EXTRA_DIST = \
|
||||
COPYING.txt \
|
||||
Makefile.msvc \
|
||||
tools/Makefile \
|
||||
tools/ttf2c.cpp \
|
||||
wishlist.txt \
|
||||
extlib/libpng/png.h \
|
||||
extlib/libpng/pngconf.h \
|
||||
extlib/libpng/pnglibconf.h \
|
||||
extlib/libpng/libpng.lib \
|
||||
extlib/si/si.h \
|
||||
extlib/si/siSync.h \
|
||||
extlib/si/siSyncPriv.h \
|
||||
extlib/si/siapp.h \
|
||||
extlib/si/spwdata.h \
|
||||
extlib/si/spwerror.h \
|
||||
extlib/si/spwmacro.h \
|
||||
extlib/si/siapp.lib \
|
||||
extlib/zlib/zconf.h \
|
||||
extlib/zlib/zlib.h \
|
||||
extlib/zlib/zlib.lib
|
||||
|
||||
dist-hook:
|
||||
@if fgrep '/DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\""' $(srcdir)/Makefile.msvc >/dev/null; \
|
||||
then :; \
|
||||
else \
|
||||
echo 'error: /DPACKAGE_VERSION flag in Makefile.msvc is out-of-date'; \
|
||||
echo '(current package version is $(PACKAGE_VERSION))'; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
## end Makefile.am
|
||||
154
Makefile.msvc
154
Makefile.msvc
|
|
@ -1,154 +0,0 @@
|
|||
# This is an NMAKE-compatible makefile.
|
||||
# SolveSpace may be built using Microsoft Visual Studio 2003 or newer.
|
||||
# (MSVC++ 6.0 is not supported.)
|
||||
|
||||
# Comment out this line to compile without the SpaceWare input library.
|
||||
#
|
||||
HAVE_SPACEWARE_INPUT = 1
|
||||
|
||||
DEFINES = \
|
||||
/D_CRT_SECURE_NO_DEPRECATE \
|
||||
/D_CRT_SECURE_NO_WARNINGS \
|
||||
/D_DEBUG \
|
||||
/D_WIN32_WINNT=0x500 \
|
||||
/D_WIN32_IE=_WIN32_WINNT \
|
||||
/DISOLATION_AWARE_ENABLED \
|
||||
/DWIN32 \
|
||||
/DWIN32_LEAN_AND_MEAN \
|
||||
/DPACKAGE_VERSION="\"2.1\""
|
||||
|
||||
# We build with /MT for compatibility with the SpaceWare library, and to
|
||||
# avoid a needless dependency on a C runtime DLL.
|
||||
#
|
||||
CXXFLAGS = /nologo /W3 /MT /Isrc /Iextlib\libpng /Iextlib\si /Iextlib\zlib /Zi /EHs # /O2
|
||||
|
||||
HEADERS = src\dsc.h \
|
||||
src\expr.h \
|
||||
src\polygon.h \
|
||||
src\sketch.h \
|
||||
src\solvespace.h \
|
||||
src\srf\surface.h \
|
||||
src\ui.h \
|
||||
src\win32\freeze.h
|
||||
|
||||
OBJDIR = obj
|
||||
|
||||
W32OBJS = $(OBJDIR)\freeze.obj \
|
||||
$(OBJDIR)\w32main.obj \
|
||||
$(OBJDIR)\w32util.obj
|
||||
|
||||
SSOBJS = $(OBJDIR)\bsp.obj \
|
||||
$(OBJDIR)\clipboard.obj \
|
||||
$(OBJDIR)\confscreen.obj \
|
||||
$(OBJDIR)\constraint.obj \
|
||||
$(OBJDIR)\constrainteq.obj \
|
||||
$(OBJDIR)\describescreen.obj \
|
||||
$(OBJDIR)\draw.obj \
|
||||
$(OBJDIR)\drawconstraint.obj \
|
||||
$(OBJDIR)\drawentity.obj \
|
||||
$(OBJDIR)\entity.obj \
|
||||
$(OBJDIR)\export.obj \
|
||||
$(OBJDIR)\exportstep.obj \
|
||||
$(OBJDIR)\exportvector.obj \
|
||||
$(OBJDIR)\expr.obj \
|
||||
$(OBJDIR)\file.obj \
|
||||
$(OBJDIR)\generate.obj \
|
||||
$(OBJDIR)\glhelper.obj \
|
||||
$(OBJDIR)\graphicswin.obj \
|
||||
$(OBJDIR)\group.obj \
|
||||
$(OBJDIR)\groupmesh.obj \
|
||||
$(OBJDIR)\mesh.obj \
|
||||
$(OBJDIR)\modify.obj \
|
||||
$(OBJDIR)\mouse.obj \
|
||||
$(OBJDIR)\polygon.obj \
|
||||
$(OBJDIR)\request.obj \
|
||||
$(OBJDIR)\solvespace.obj \
|
||||
$(OBJDIR)\style.obj \
|
||||
$(OBJDIR)\system.obj \
|
||||
$(OBJDIR)\textscreens.obj \
|
||||
$(OBJDIR)\textwin.obj \
|
||||
$(OBJDIR)\toolbar.obj \
|
||||
$(OBJDIR)\ttf.obj \
|
||||
$(OBJDIR)\undoredo.obj \
|
||||
$(OBJDIR)\util.obj \
|
||||
$(OBJDIR)\view.obj
|
||||
|
||||
SRFOBJS = $(OBJDIR)\boolean.obj \
|
||||
$(OBJDIR)\curve.obj \
|
||||
$(OBJDIR)\merge.obj \
|
||||
$(OBJDIR)\ratpoly.obj \
|
||||
$(OBJDIR)\raycast.obj \
|
||||
$(OBJDIR)\surface.obj \
|
||||
$(OBJDIR)\surfinter.obj \
|
||||
$(OBJDIR)\triangulate.obj
|
||||
|
||||
RES = $(OBJDIR)\resource.res
|
||||
|
||||
LIBS = user32.lib gdi32.lib comctl32.lib advapi32.lib shell32.lib opengl32.lib glu32.lib \
|
||||
extlib\libpng\libpng.lib extlib\zlib\zlib.lib
|
||||
|
||||
# Note that the Perl scripts require the GD module.
|
||||
#
|
||||
#PERL = perl
|
||||
|
||||
!IFDEF HAVE_SPACEWARE_INPUT
|
||||
DEFINES = $(DEFINES) -DHAVE_SPACEWARE_INPUT
|
||||
LIBS = $(LIBS) extlib\si\siapp.lib
|
||||
!ENDIF
|
||||
|
||||
all: $(OBJDIR)\solvespace.exe
|
||||
@copy /y $(OBJDIR)\solvespace.exe .
|
||||
@echo solvespace.exe
|
||||
|
||||
clean:
|
||||
-del /Q obj\*
|
||||
-rmdir $(OBJDIR)
|
||||
|
||||
$(OBJDIR)\solvespace.exe: $(SSOBJS) $(SRFOBJS) $(W32OBJS) $(RES)
|
||||
$(CXX) $(DEFINES) $(CXXFLAGS) /Fe$(OBJDIR)\solvespace.exe $(SSOBJS) $(SRFOBJS) $(W32OBJS) $(RES) $(LIBS)
|
||||
editbin /nologo /STACK:8388608 $(OBJDIR)\solvespace.exe
|
||||
|
||||
{src}.cpp{$(OBJDIR)}.obj::
|
||||
@if not exist $(OBJDIR) mkdir $(OBJDIR)
|
||||
$(CXX) $(CXXFLAGS) $(DEFINES) /c /Fo$(OBJDIR)\ $<
|
||||
|
||||
{src\srf}.cpp{$(OBJDIR)}.obj::
|
||||
@if not exist $(OBJDIR) mkdir $(OBJDIR)
|
||||
$(CXX) $(CXXFLAGS) $(DEFINES) /c /Fo$(OBJDIR)\ $<
|
||||
|
||||
{src\win32}.cpp{$(OBJDIR)}.obj::
|
||||
@if not exist $(OBJDIR) mkdir $(OBJDIR)
|
||||
$(CXX) $(CXXFLAGS) $(DEFINES) /c /Fo$(OBJDIR)\ $<
|
||||
|
||||
$(RES): src\win32\$(@B).rc src\win32\icon.ico
|
||||
@if not exist $(OBJDIR) mkdir $(OBJDIR)
|
||||
$(RC) /fo$@ src\win32\$(@B).rc
|
||||
|
||||
$(OBJDIR)\glhelper.obj: src\bitmapextra.table.h src\bitmapfont.table.h src\font.table.h
|
||||
|
||||
$(OBJDIR)\textwin.obj: src\icons.h
|
||||
|
||||
$(OBJDIR)\toolbar.obj: src\icons.h
|
||||
|
||||
!IFDEF PERL
|
||||
|
||||
src\icons.h: src\icons\*.png src\png2c.pl
|
||||
$(PERL) src\png2c.pl $@ src\icons-proto.h src
|
||||
|
||||
src\bitmapextra.table.h: src\icons\*.png src\pngchar2c.pl
|
||||
$(PERL) src\pngchar2c.pl src >$@.tmp
|
||||
move /y $@.tmp $@
|
||||
|
||||
!ELSE IF EXIST(src\built)
|
||||
|
||||
src\icons.h: src\built\icons.h src\built\icons-proto.h
|
||||
copy /y src\built\icons.h $@
|
||||
copy /y src\built\icons-proto.h src
|
||||
|
||||
src\bitmapextra.table.h: src\built\bitmapextra.table.h
|
||||
copy /y src\built\bitmapextra.table.h $@
|
||||
|
||||
src\bitmapfont.table.h: src\built\bitmapfont.table.h
|
||||
copy /y src\built\bitmapfont.table.h $@
|
||||
|
||||
!ENDIF
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
#!/bin/sh
|
||||
exec autoreconf --force --install
|
||||
207
configure.ac
207
configure.ac
|
|
@ -1,207 +0,0 @@
|
|||
## configure.ac
|
||||
|
||||
AC_PREREQ([2.59])
|
||||
AC_INIT([SolveSpace], [2.1], [jwesthues@cq.cx], [solvespace])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_SRCDIR([src/solvespace.cpp])
|
||||
AC_CONFIG_AUX_DIR([ac-aux])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
AM_INIT_AUTOMAKE([1.9.6 -Wall -Werror foreign subdir-objects tar-ustar])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
AM_PROG_AR
|
||||
|
||||
AC_PROG_INSTALL
|
||||
dnl AC_PROG_MAKE_SET
|
||||
AC_HEADER_STDC
|
||||
AC_C_BIGENDIAN
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
|
||||
# Check for Libtool
|
||||
#
|
||||
dnl AC_DISABLE_SHARED
|
||||
LT_INIT
|
||||
|
||||
# Do we have Perl?
|
||||
#
|
||||
AC_CHECK_PROG([PERL], [perl], [perl], [false])
|
||||
|
||||
# Check for headers that define integer types
|
||||
#
|
||||
AC_CHECK_HEADERS([inttypes.h stdint.h sys/socket.h])
|
||||
|
||||
# Check for various integer types
|
||||
#
|
||||
AC_TYPE_INT8_T
|
||||
AC_TYPE_INT16_T
|
||||
AC_TYPE_INT32_T
|
||||
AC_TYPE_INT64_T
|
||||
AC_TYPE_UINT8_T
|
||||
AC_TYPE_UINT16_T
|
||||
AC_TYPE_UINT32_T
|
||||
AC_TYPE_UINT64_T
|
||||
AC_TYPE_SSIZE_T
|
||||
AC_DEFINE([HAVE_C99_INTEGER_TYPES], [1], [Define to 1 if (self-explanatory).])
|
||||
|
||||
# Check the size of various types
|
||||
#
|
||||
AC_CHECK_SIZEOF([char])
|
||||
AC_CHECK_SIZEOF([short])
|
||||
AC_CHECK_SIZEOF([int])
|
||||
AC_CHECK_SIZEOF([long])
|
||||
AC_CHECK_SIZEOF([float])
|
||||
AC_CHECK_SIZEOF([double])
|
||||
AC_CHECK_SIZEOF([long double])
|
||||
AC_CHECK_SIZEOF([void *])
|
||||
AC_CHECK_SIZEOF([size_t])
|
||||
|
||||
# Is the pre-built source directory present?
|
||||
#
|
||||
AM_CONDITIONAL([HAVE_PREBUILT_SOURCE], [test -d $srcdir/src/built])
|
||||
|
||||
##
|
||||
## Windows support
|
||||
##
|
||||
|
||||
AC_EXEEXT
|
||||
AC_OBJEXT
|
||||
|
||||
win32=no
|
||||
AC_EGREP_CPP([SOLVESPACE_WIN32],dnl
|
||||
[#if (defined(_MSC_VER) && defined(_WIN32)) || defined(__MINGW32__)
|
||||
SOLVESPACE_WIN32
|
||||
#endif], [win32=yes])
|
||||
|
||||
AM_CONDITIONAL([WIN32], [test "$win32" = yes])
|
||||
|
||||
mingw=no
|
||||
AC_EGREP_CPP([SOLVESPACE_MINGW],dnl
|
||||
[#if defined(__MINGW32__)
|
||||
SOLVESPACE_MINGW
|
||||
#endif], [mingw=yes])
|
||||
|
||||
AM_CONDITIONAL([MINGW], [test "$mingw" = yes])
|
||||
|
||||
AH_VERBATIM([MSVC_FLAGS], [#if defined(_MSC_VER) && defined(_WIN32)
|
||||
# define _CRT_SECURE_NO_DEPRECATE 1
|
||||
# define _CRT_SECURE_NO_WARNINGS 1
|
||||
# define _WIN32_WINNT 0x500
|
||||
# define _WIN32_IE _WIN32_WINNT
|
||||
# define ISOLATION_AWARE_ENABLED 1
|
||||
# define WIN32 1
|
||||
# define WIN32_LEAN_AND_MEAN 1
|
||||
#endif])
|
||||
|
||||
AC_CHECK_LIB(
|
||||
[png], [png_set_sig_bytes], [],
|
||||
[AC_MSG_ERROR([Cannot find -lpng])])
|
||||
AC_CHECK_HEADERS(
|
||||
[png.h], [],
|
||||
[AC_MSG_ERROR([Cannot find png.h])])
|
||||
|
||||
AC_CHECK_LIB(
|
||||
[GL], [glVertex2d], [],
|
||||
[AC_MSG_ERROR([Cannot find -lGL])])
|
||||
AC_CHECK_HEADERS(
|
||||
[GL/gl.h], [],
|
||||
[AC_MSG_ERROR([Cannot find GL/gl.h])])
|
||||
|
||||
AC_CHECK_LIB(
|
||||
[GLU], [gluTessVertex], [],
|
||||
[AC_MSG_ERROR([Cannot find -lGLU])])
|
||||
AC_CHECK_HEADERS(
|
||||
[GL/glu.h], [],
|
||||
[AC_MSG_ERROR([Cannot find GL/glu.h])])
|
||||
|
||||
##
|
||||
## FLTK
|
||||
##
|
||||
|
||||
AX_FLTK([1.3], [--use-gl --use-images --use-forms])
|
||||
AM_CONDITIONAL([HAVE_FLTK], [test "$have_fltk" = yes])
|
||||
|
||||
if test "$have_fltk" = yes
|
||||
then
|
||||
x=`echo "$FLTK_VERSION" | cut -d. -f1`
|
||||
y=`echo "$FLTK_VERSION" | cut -d. -f2`
|
||||
z=`echo "$FLTK_VERSION" | cut -d. -f3`
|
||||
|
||||
if test `expr 10000 '*' $x + 100 '*' $y + $z` -ge 10301
|
||||
then
|
||||
AC_DEFINE([HAVE_FLTK_FULLSCREEN], [1],
|
||||
[Define to 1 if your copy of FLTK has proper fullscreen support.])
|
||||
fi
|
||||
fi
|
||||
|
||||
##
|
||||
## Libspnav
|
||||
##
|
||||
|
||||
AC_ARG_WITH([libspnav],
|
||||
[AS_HELP_STRING([[--with-libspnav[=PRFX]]],
|
||||
[Enable SpaceNavigator (3D mouse) support via libspnav driver installed in PRFX])])
|
||||
|
||||
case "$with_libspnav" in
|
||||
no|'') want_libspnav=no ;;
|
||||
yes) want_libspnav=yes ;;
|
||||
*)
|
||||
want_libspnav=yes
|
||||
LIBSPNAV_CPPFLAGS="-I$with_libspnav/include"
|
||||
LIBSPNAV_LDFLAGS="-L$with_libspnav/lib"
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "$want_libspnav" = yes
|
||||
then
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
|
||||
CPPFLAGS="$LIBSPNAV_CPPFLAGS"
|
||||
LDFLAGS="$LIBSPNAV_LDFLAGS"
|
||||
LIBS="-lspnav"
|
||||
|
||||
AC_MSG_CHECKING([for libspnav])
|
||||
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <spnav.h>],
|
||||
[if (spnav_open() < 0) return 1 /* ; */])],
|
||||
[AC_MSG_RESULT([yes])
|
||||
AC_DEFINE([HAVE_LIBSPNAV], [1], [Define to 1 if you have the SpaceNav driver.])
|
||||
LIBSPNAV_LIBS="$LDFLAGS $LIBS"],
|
||||
[AC_MSG_ERROR([cannot find libspnav])])
|
||||
|
||||
CPPFLAGS="$save_CPPFLAGS"
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
LIBS="$save_LIBS"
|
||||
fi
|
||||
|
||||
AC_SUBST([LIBSPNAV_CPPFLAGS])
|
||||
AC_SUBST([LIBSPNAV_LIBS])
|
||||
|
||||
##
|
||||
## Wrap it up
|
||||
##
|
||||
|
||||
AC_CONFIG_FILES([Makefile exposed/Makefile src/Makefile])
|
||||
AC_OUTPUT
|
||||
|
||||
cat <<EOF
|
||||
|
||||
$PACKAGE-$VERSION configuration summary:
|
||||
|
||||
Install prefix ......... : ${prefix}
|
||||
C++ preprocessor ....... : ${CXXCPP}
|
||||
C++ compiler ........... : ${CXX}
|
||||
Linker ................. : ${LD}
|
||||
C preprocessor flags ... : ${CPPFLAGS}
|
||||
C++ compiler flags ..... : ${CXXFLAGS}
|
||||
Linker flags ........... : ${LDFLAGS}
|
||||
Extra libraries ........ : ${LIBS}
|
||||
|
||||
EOF
|
||||
|
||||
## end configure.ac
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
## exposed/Makefile.am
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/include
|
||||
|
||||
AM_LDFLAGS = -L../src
|
||||
|
||||
noinst_PROGRAMS = CDemo
|
||||
|
||||
CDemo_SOURCES = CDemo.c
|
||||
|
||||
CDemo_LDADD =
|
||||
|
||||
if HAVE_FLTK
|
||||
CDemo_SOURCES += ../src/fltk/fltkutil.cpp
|
||||
CDemo_LDADD += $(FLTK_LDFLAGS) -lX11 -lGL -lGLU $(LIBSPNAV_LIBS)
|
||||
endif
|
||||
if WIN32
|
||||
CDemo_SOURCES += ../src/win32/w32util.cpp
|
||||
endif
|
||||
|
||||
CDemo_LDADD += -lslvs
|
||||
|
||||
EXTRA_DIST = \
|
||||
DOC.txt \
|
||||
Makefile.msvc \
|
||||
VbDemo.vb
|
||||
|
||||
## end exposed/Makefile.am
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
# This is an NMAKE-compatible makefile.
|
||||
|
||||
DEFINES = \
|
||||
/D_CRT_SECURE_NO_DEPRECATE \
|
||||
/D_CRT_SECURE_NO_WARNINGS \
|
||||
/D_DEBUG \
|
||||
/D_WIN32_WINNT=0x500 \
|
||||
/D_WIN32_IE=_WIN32_WINNT \
|
||||
/DISOLATION_AWARE_ENABLED \
|
||||
/DWIN32 \
|
||||
/DWIN32_LEAN_AND_MEAN \
|
||||
/DLIBRARY
|
||||
|
||||
CFLAGS = /nologo /W3 /MT /I..\src /Zi /O2
|
||||
CXXFLAGS = $(CFLAGS) /EHs
|
||||
|
||||
OBJDIR = obj
|
||||
|
||||
SSOBJS = $(OBJDIR)\constrainteq.obj \
|
||||
$(OBJDIR)\entity.obj \
|
||||
$(OBJDIR)\expr.obj \
|
||||
$(OBJDIR)\system.obj \
|
||||
$(OBJDIR)\util.obj
|
||||
|
||||
W32OBJS = $(OBJDIR)\w32util.obj
|
||||
|
||||
LIBOBJS = $(OBJDIR)\lib.obj
|
||||
|
||||
LIBS = user32.lib gdi32.lib comctl32.lib advapi32.lib shell32.lib
|
||||
|
||||
all: $(OBJDIR)\CDemo.exe
|
||||
@copy /y $(OBJDIR)\slvs.dll .
|
||||
@echo slvs.dll
|
||||
@copy /y $(OBJDIR)\CDemo.exe .
|
||||
@echo CDemo.exe
|
||||
|
||||
clean:
|
||||
-rmdir /s /q $(OBJDIR)
|
||||
|
||||
$(OBJDIR)\slvs.dll: $(SSOBJS) $(LIBOBJS) $(W32OBJS)
|
||||
$(CXX) $(CXXFLAGS) /LD /Fe$(OBJDIR)\slvs.dll $(SSOBJS) $(LIBOBJS) $(W32OBJS) $(LIBS)
|
||||
|
||||
$(OBJDIR)\CDemo.exe: CDemo.c $(OBJDIR)\slvs.dll
|
||||
$(CC) $(CFLAGS) $(DEFINES) /Fo$(OBJDIR)\ /Fe$(OBJDIR)\CDemo.exe CDemo.c $(OBJDIR)\slvs.lib $(LIBS)
|
||||
|
||||
.cpp{$(OBJDIR)}.obj::
|
||||
@if not exist $(OBJDIR) mkdir $(OBJDIR)
|
||||
$(CXX) $(CXXFLAGS) $(DEFINES) /c /Fo$(OBJDIR)\ $<
|
||||
|
||||
{..\src}.cpp{$(OBJDIR)}.obj::
|
||||
@if not exist $(OBJDIR) mkdir $(OBJDIR)
|
||||
$(CXX) $(CXXFLAGS) $(DEFINES) /c /Fo$(OBJDIR)\ $<
|
||||
|
||||
{..\src\win32}.cpp{$(OBJDIR)}.obj::
|
||||
@if not exist $(OBJDIR) mkdir $(OBJDIR)
|
||||
$(CXX) $(CXXFLAGS) $(DEFINES) /c /Fo$(OBJDIR)\ $<
|
||||
179
m4/ax_fltk.m4
179
m4/ax_fltk.m4
|
|
@ -1,179 +0,0 @@
|
|||
# ===========================================================================
|
||||
# http://www.gnu.org/software/autoconf-archive/ax_fltk.html
|
||||
# ===========================================================================
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# AX_FLTK(API-VERSION[,
|
||||
# USE-OPTIONS[,
|
||||
# ACTION-IF-FOUND[,
|
||||
# ACTION-IF-NOT-FOUND]]])
|
||||
#
|
||||
# DESCRIPTION
|
||||
#
|
||||
# This macro checks for the presence of an installed copy of FLTK
|
||||
# matching the specified API-VERSION (which can be "1.1", "1.3" and so
|
||||
# on). If found, the following variables are set and AC_SUBST'ed with
|
||||
# values obtained from the fltk-config script:
|
||||
#
|
||||
# FLTK_VERSION
|
||||
# FLTK_API_VERSION
|
||||
# FLTK_CC
|
||||
# FLTK_CXX
|
||||
# FLTK_OPTIM
|
||||
# FLTK_CFLAGS
|
||||
# FLTK_CXXFLAGS
|
||||
# FLTK_LDFLAGS
|
||||
# FLTK_LDSTATICFLAGS
|
||||
# FLTK_LIBS
|
||||
# FLTK_PREFIX
|
||||
# FLTK_INCLUDEDIR
|
||||
#
|
||||
# USE-OPTIONS is a space-separated set of --use-* options to pass to the
|
||||
# fltk-config script when populating the above variables.
|
||||
#
|
||||
# If you are using FLTK extensions (e.g. OpenGL support, extra image
|
||||
# libraries, Forms compatibility), then you can specify a set of
|
||||
# space-separated options like "--use-gl", "--use-images" etc. for
|
||||
# USE-OPTIONS.
|
||||
#
|
||||
# ACTION-IF-FOUND is a list of shell commands to run if a matching
|
||||
# version of FLTK is found, and ACTION-IF-NOT-FOUND is a list of commands
|
||||
# to run it if it is not found. If ACTION-IF-FOUND is not specified, the
|
||||
# default action will define HAVE_FLTK.
|
||||
#
|
||||
# Please let the author(s) know if this macro fails on any platform, or
|
||||
# if you have any other suggestions or comments.
|
||||
#
|
||||
# LICENSE
|
||||
#
|
||||
# Copyright (c) 2013 Daniel Richard G. <skunk@iSKUNK.ORG>
|
||||
#
|
||||
# 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/>.
|
||||
#
|
||||
# As a special exception, the respective Autoconf Macro's copyright owner
|
||||
# gives unlimited permission to copy, distribute and modify the configure
|
||||
# scripts that are the output of Autoconf when processing the Macro. You
|
||||
# need not follow the terms of the GNU General Public License when using
|
||||
# or distributing such scripts, even though portions of the text of the
|
||||
# Macro appear in them. The GNU General Public License (GPL) does govern
|
||||
# all other use of the material that constitutes the Autoconf Macro.
|
||||
#
|
||||
# This special exception to the GPL applies to versions of the Autoconf
|
||||
# Macro released by the Autoconf Archive. When you make and distribute a
|
||||
# modified version of the Autoconf Macro, you may extend this special
|
||||
# exception to the GPL to apply to your modified version as well.
|
||||
|
||||
#serial 0
|
||||
|
||||
AC_DEFUN([AX_FLTK], [
|
||||
AC_LANG_PUSH([C++])
|
||||
|
||||
m4_bmatch([$1], [^[1-9]\.[0-9]$], [],
|
||||
[m4_fatal([invalid FLTK API version "$1"])])
|
||||
m4_bmatch([$2], [^\(\(--use-[a-z]+\)\( +--use-[a-z]+\)*\)?$], [],
|
||||
[m4_fatal([invalid fltk-config use-options string "$2"])])
|
||||
|
||||
AC_ARG_WITH([fltk],
|
||||
[AS_HELP_STRING([--with-fltk=PREFIX],
|
||||
[use FLTK $1 libraries installed in PREFIX])])
|
||||
|
||||
case "_$with_fltk" in
|
||||
_no)
|
||||
FLTK_CONFIG=
|
||||
;;
|
||||
|
||||
_|_yes)
|
||||
AC_PATH_PROG([FLTK_CONFIG], [fltk-config])
|
||||
;;
|
||||
|
||||
*)
|
||||
AC_PATH_PROG([FLTK_CONFIG], [fltk-config], , [$with_fltk/bin])
|
||||
;;
|
||||
esac
|
||||
|
||||
FLTK_VERSION=
|
||||
FLTK_API_VERSION=
|
||||
|
||||
FLTK_CC=
|
||||
FLTK_CXX=
|
||||
FLTK_OPTIM=
|
||||
FLTK_CFLAGS=
|
||||
FLTK_CXXFLAGS=
|
||||
FLTK_LDFLAGS=
|
||||
FLTK_LDSTATICFLAGS=
|
||||
FLTK_LIBS=
|
||||
FLTK_PREFIX=
|
||||
FLTK_INCLUDEDIR=
|
||||
|
||||
have_fltk=no
|
||||
|
||||
if test -n "$FLTK_CONFIG"
|
||||
then
|
||||
FLTK_VERSION=`$FLTK_CONFIG --version`
|
||||
FLTK_API_VERSION=`$FLTK_CONFIG --api-version`
|
||||
|
||||
AC_MSG_CHECKING([for FLTK API version $1])
|
||||
|
||||
if test "_$FLTK_API_VERSION" = "_$1"
|
||||
then
|
||||
have_fltk=yes
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
fl_opt="$2"
|
||||
|
||||
FLTK_CC=`$FLTK_CONFIG $fl_opt --cc`
|
||||
FLTK_CXX=`$FLTK_CONFIG $fl_opt --cxx`
|
||||
FLTK_OPTIM=`$FLTK_CONFIG $fl_opt --optim`
|
||||
FLTK_CFLAGS=`$FLTK_CONFIG $fl_opt --cflags`
|
||||
FLTK_CXXFLAGS=`$FLTK_CONFIG $fl_opt --cxxflags`
|
||||
FLTK_LDFLAGS=`$FLTK_CONFIG $fl_opt --ldflags`
|
||||
FLTK_LDSTATICFLAGS=`$FLTK_CONFIG $fl_opt --ldstaticflags`
|
||||
FLTK_LIBS=`$FLTK_CONFIG $fl_opt --libs`
|
||||
FLTK_PREFIX=`$FLTK_CONFIG $fl_opt --prefix`
|
||||
FLTK_INCLUDEDIR=`$FLTK_CONFIG $fl_opt --includedir`
|
||||
fi
|
||||
|
||||
# Finally, execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND:
|
||||
#
|
||||
if test "$have_fltk" = yes
|
||||
then
|
||||
:
|
||||
ifelse([$3], ,
|
||||
[AC_DEFINE([HAVE_FLTK], [1], [Define if you have the FLTK libraries.])],
|
||||
[$3])
|
||||
else
|
||||
:
|
||||
$4
|
||||
fi
|
||||
|
||||
AC_SUBST([FLTK_VERSION])
|
||||
AC_SUBST([FLTK_API_VERSION])
|
||||
|
||||
AC_SUBST([FLTK_CC])
|
||||
AC_SUBST([FLTK_CXX])
|
||||
AC_SUBST([FLTK_OPTIM])
|
||||
AC_SUBST([FLTK_CFLAGS])
|
||||
AC_SUBST([FLTK_CXXFLAGS])
|
||||
AC_SUBST([FLTK_LDFLAGS])
|
||||
AC_SUBST([FLTK_LDSTATICFLAGS])
|
||||
AC_SUBST([FLTK_LIBS])
|
||||
AC_SUBST([FLTK_PREFIX])
|
||||
AC_SUBST([FLTK_INCLUDEDIR])
|
||||
|
||||
AC_LANG_POP
|
||||
])dnl AX_FLTK
|
||||
221
src/Makefile.am
221
src/Makefile.am
|
|
@ -1,221 +0,0 @@
|
|||
## src/Makefile.am
|
||||
|
||||
noinst_LIBRARIES = libslvs.a
|
||||
|
||||
libslvs_a_SOURCES = \
|
||||
util.cpp \
|
||||
entity.cpp \
|
||||
expr.cpp \
|
||||
constraint.cpp \
|
||||
constrainteq.cpp \
|
||||
system.cpp \
|
||||
lib.cpp
|
||||
libslvs_a_CPPFLAGS = -DLIBRARY -I$(top_srcdir)/include
|
||||
|
||||
AM_CPPFLAGS = $(FLTK_CXXFLAGS) $(LIBSPNAV_CPPFLAGS)
|
||||
|
||||
if WIN32
|
||||
AM_CPPFLAGS += \
|
||||
-I$(top_srcdir)/extlib/libpng \
|
||||
-I$(top_srcdir)/extlib/si \
|
||||
-I$(top_srcdir)/extlib/zlib
|
||||
endif
|
||||
|
||||
bin_PROGRAMS = solvespace
|
||||
|
||||
built_src = \
|
||||
bitmapextra.table.h \
|
||||
bitmapfont.table.h \
|
||||
icons-proto.h \
|
||||
icons.h
|
||||
|
||||
BUILT_SOURCES = $(built_src)
|
||||
|
||||
solvespace_SOURCES = \
|
||||
$(built_src) \
|
||||
bsp.cpp \
|
||||
clipboard.cpp \
|
||||
confscreen.cpp \
|
||||
constraint.cpp \
|
||||
constrainteq.cpp \
|
||||
describescreen.cpp \
|
||||
draw.cpp \
|
||||
drawconstraint.cpp \
|
||||
drawentity.cpp \
|
||||
dsc.h \
|
||||
entity.cpp \
|
||||
export.cpp \
|
||||
exportstep.cpp \
|
||||
exportvector.cpp \
|
||||
expr.h \
|
||||
expr.cpp \
|
||||
file.cpp \
|
||||
font.table.h \
|
||||
generate.cpp \
|
||||
glhelper.cpp \
|
||||
graphicswin.cpp \
|
||||
group.cpp \
|
||||
groupmesh.cpp \
|
||||
mesh.cpp \
|
||||
modify.cpp \
|
||||
mouse.cpp \
|
||||
polygon.h \
|
||||
polygon.cpp \
|
||||
request.cpp \
|
||||
sketch.h \
|
||||
solvespace.h \
|
||||
solvespace.cpp \
|
||||
style.cpp \
|
||||
system.cpp \
|
||||
textscreens.cpp \
|
||||
textwin.cpp \
|
||||
toolbar.cpp \
|
||||
ttf.cpp \
|
||||
ui.h \
|
||||
undoredo.cpp \
|
||||
util.cpp \
|
||||
view.cpp \
|
||||
srf/boolean.cpp \
|
||||
srf/curve.cpp \
|
||||
srf/merge.cpp \
|
||||
srf/ratpoly.cpp \
|
||||
srf/raycast.cpp \
|
||||
srf/surface.h \
|
||||
srf/surface.cpp \
|
||||
srf/surfinter.cpp \
|
||||
srf/triangulate.cpp
|
||||
|
||||
if HAVE_FLTK
|
||||
solvespace_SOURCES += \
|
||||
fltk/fltkmain.cpp \
|
||||
fltk/fltkutil.cpp
|
||||
|
||||
solvespace_LDADD = $(FLTK_LDFLAGS) -lX11 -lGL -lGLU $(LIBSPNAV_LIBS)
|
||||
endif
|
||||
|
||||
if WIN32
|
||||
solvespace_SOURCES += \
|
||||
win32/freeze.h \
|
||||
win32/freeze.cpp \
|
||||
win32/w32main.cpp \
|
||||
win32/w32util.cpp
|
||||
|
||||
if MINGW
|
||||
solvespace_LDFLAGS = \
|
||||
-llibpng \
|
||||
-lzlib \
|
||||
-luser32 -lgdi32 -lcomctl32 -ladvapi32 -lshell32 \
|
||||
-lopengl32 -lglu32
|
||||
else ! MINGW
|
||||
solvespace_LDFLAGS = -link \
|
||||
-libpath:$(top_srcdir)/extlib/libpng libpng.lib \
|
||||
-libpath:$(top_srcdir)/extlib/zlib zlib.lib \
|
||||
user32.lib gdi32.lib comctl32.lib advapi32.lib shell32.lib \
|
||||
opengl32.lib glu32.lib
|
||||
endif ! MINGW
|
||||
endif WIN32
|
||||
|
||||
icons = \
|
||||
icons/angle.png \
|
||||
icons/arc.png \
|
||||
icons/assemble.png \
|
||||
icons/bezier.png \
|
||||
icons/char-0-check-false.png \
|
||||
icons/char-1-check-true.png \
|
||||
icons/char-2-radio-false.png \
|
||||
icons/char-3-radio-true.png \
|
||||
icons/circle.png \
|
||||
icons/constraint.png \
|
||||
icons/construction.png \
|
||||
icons/edges.png \
|
||||
icons/equal.png \
|
||||
icons/extrude.png \
|
||||
icons/faces.png \
|
||||
icons/hidden-lines.png \
|
||||
icons/horiz.png \
|
||||
icons/in3d.png \
|
||||
icons/length.png \
|
||||
icons/line.png \
|
||||
icons/mesh.png \
|
||||
icons/normal.png \
|
||||
icons/ontoworkplane.png \
|
||||
icons/other-supp.png \
|
||||
icons/parallel.png \
|
||||
icons/perpendicular.png \
|
||||
icons/point.png \
|
||||
icons/pointonx.png \
|
||||
icons/rectangle.png \
|
||||
icons/ref.png \
|
||||
icons/same-orientation.png \
|
||||
icons/shaded.png \
|
||||
icons/sketch-in-3d.png \
|
||||
icons/sketch-in-plane.png \
|
||||
icons/step-rotate.png \
|
||||
icons/step-translate.png \
|
||||
icons/symmetric.png \
|
||||
icons/tangent-arc.png \
|
||||
icons/text.png \
|
||||
icons/trim.png \
|
||||
icons/vert.png \
|
||||
icons/workplane.png
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(icons) \
|
||||
png2c.pl \
|
||||
pngchar2c.pl \
|
||||
win32/icon.ico \
|
||||
win32/manifest.xml \
|
||||
win32/resource.rc
|
||||
|
||||
if MAINTAINER_MODE
|
||||
|
||||
icons.h: $(icons) $(srcdir)/png2c.pl
|
||||
$(PERL) $(srcdir)/png2c.pl icons.h icons-proto.h $(srcdir)
|
||||
|
||||
icons-proto.h: icons.h
|
||||
@exit 0
|
||||
|
||||
bitmapextra.table.h: $(icons) $(srcdir)/pngchar2c.pl
|
||||
$(PERL) $(srcdir)/pngchar2c.pl $(srcdir) >bitmapextra.table.tmp
|
||||
mv -f bitmapextra.table.tmp bitmapextra.table.h
|
||||
|
||||
endif MAINTAINER_MODE
|
||||
|
||||
if HAVE_PREBUILT_SOURCE
|
||||
if ! MAINTAINER_MODE
|
||||
|
||||
icons.h: $(srcdir)/built/icons.h
|
||||
cp $(srcdir)/built/icons.h icons.h
|
||||
|
||||
icons-proto.h: $(srcdir)/built/icons-proto.h
|
||||
cp $(srcdir)/built/icons-proto.h icons-proto.h
|
||||
|
||||
bitmapextra.table.h: $(srcdir)/built/bitmapextra.table.h
|
||||
cp $(srcdir)/built/bitmapextra.table.h bitmapextra.table.h
|
||||
|
||||
endif ! MAINTAINER_MODE
|
||||
|
||||
bitmapfont.table.h: $(srcdir)/built/bitmapfont.table.h
|
||||
cp $(srcdir)/built/bitmapfont.table.h bitmapfont.table.h
|
||||
|
||||
endif HAVE_PREBUILT_SOURCE
|
||||
|
||||
run-valgrind: solvespace$(EXEEXT)
|
||||
@test -z "$$VALGRIND_OPTS" || echo VALGRIND_OPTS = $$VALGRIND_OPTS
|
||||
valgrind \
|
||||
--tool=memcheck \
|
||||
--verbose \
|
||||
--track-fds=yes \
|
||||
--log-file=vg.%p.out \
|
||||
--num-callers=50 \
|
||||
--error-limit=no \
|
||||
--read-var-info=yes \
|
||||
--leak-check=full \
|
||||
--leak-resolution=high \
|
||||
--show-reachable=yes \
|
||||
--track-origins=yes \
|
||||
--malloc-fill=0xac \
|
||||
--free-fill=0xde \
|
||||
./solvespace$(EXEEXT)
|
||||
|
||||
## end src/Makefile.am
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
all:
|
||||
cl ttf2c.cpp user32.lib gdi32.lib comctl32.lib
|
||||
ttf2c.exe > ..\bitmapfont.table.h
|
||||
|
||||
Loading…
Reference in New Issue