Trying to fix linux compatibility -> libSDLtest.* is now installed
to /usr/local/lib.
This commit is contained in:
parent
2ea1a8a90c
commit
7ffad15a4a
39 changed files with 32 additions and 24 deletions
|
@ -1,6 +1,6 @@
|
|||
ACLOCAL_AMFLAGS = -I acinclude -I build-scripts
|
||||
|
||||
SUBDIRS = src/libtest \
|
||||
SUBDIRS = src/libSDLtest \
|
||||
src/runner \
|
||||
tests/testdummy \
|
||||
tests/testrect \
|
||||
|
@ -10,7 +10,7 @@ SUBDIRS = src/libtest \
|
|||
tests/testrwops \
|
||||
tests/testrender
|
||||
|
||||
all-local: install
|
||||
##all-local: install
|
||||
install: install-runner install-tests
|
||||
install-runner:
|
||||
$(SHELL) build-scripts/install-runner.sh
|
||||
|
|
|
@ -3,4 +3,11 @@
|
|||
cp src/runner/.libs/runner .
|
||||
chmod u+x runner
|
||||
|
||||
PLATFORM="$(uname)"
|
||||
if [[ $PLATFORM == "Linux" ]]; then
|
||||
cp -f src/libSDLtest/.libs/libSDLtest.so.0 /usr/local/lib
|
||||
elif [[ $PLATFORM == "Darwin" ]]; then
|
||||
cp -f src/libSDLtest/.libs/libSDLtest.0.dylib /usr/local/lib
|
||||
fi
|
||||
|
||||
echo "Runner installed."
|
||||
|
|
|
@ -34,7 +34,7 @@ AC_FUNC_FORK
|
|||
|
||||
AC_CONFIG_FILES([Makefile
|
||||
src/runner/Makefile
|
||||
src/libtest/Makefile
|
||||
src/libSDLtest/Makefile
|
||||
tests/testdummy/Makefile
|
||||
tests/testrect/Makefile
|
||||
tests/testplatform/Makefile
|
||||
|
|
|
@ -23,9 +23,9 @@
|
|||
|
||||
#include "../src/runner/logger.h"
|
||||
|
||||
#include "../src/libtest/common/common.h"
|
||||
#include "../src/libtest/common/images.h"
|
||||
#include "../src/libtest/fuzzer/fuzzer.h"
|
||||
#include "../src/libSDLtest/common/common.h"
|
||||
#include "../src/libSDLtest/common/images.h"
|
||||
#include "../src/libSDLtest/fuzzer/fuzzer.h"
|
||||
|
||||
#define TEST_ENABLED 1
|
||||
#define TEST_DISABLED 0
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
lib_LTLIBRARIES = libtest.la
|
||||
libtest_la_SOURCES = SDL_test.c \
|
||||
INCLUDE = -I../../include
|
||||
|
||||
lib_LTLIBRARIES = libSDLtest.la
|
||||
libSDLtest_la_SOURCES = SDL_test.c \
|
||||
logger_helpers.c \
|
||||
plain_logger.c \
|
||||
xml_logger.c xml.c \
|
||||
|
@ -14,9 +16,8 @@ libtest_la_SOURCES = SDL_test.c \
|
|||
fuzzer/utl_random.c \
|
||||
fuzzer/fuzzer.c \
|
||||
../runner/logger.h
|
||||
INCLUDE = -I../../include
|
||||
libtest_la_CLAGS = -fPIC -g
|
||||
libtest_la_LDFLAGS = `sdl-config --libs`
|
||||
libSDLtest_la_CLAGS = -fPIC -g
|
||||
libSDLtest_la_LDFLAGS = `sdl-config --libs`
|
||||
|
||||
libtest: libtest.la
|
||||
libtest: libSDLtest.la
|
||||
echo "Test library compiled."
|
0
test/test-automation/src/libtest/fuzzer/utl_crc32.c → test/test-automation/src/libSDLtest/fuzzer/utl_crc32.c
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_crc32.c → test/test-automation/src/libSDLtest/fuzzer/utl_crc32.c
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_crc32.h → test/test-automation/src/libSDLtest/fuzzer/utl_crc32.h
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_crc32.h → test/test-automation/src/libSDLtest/fuzzer/utl_crc32.h
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_md5.c → test/test-automation/src/libSDLtest/fuzzer/utl_md5.c
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_md5.c → test/test-automation/src/libSDLtest/fuzzer/utl_md5.c
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_md5.h → test/test-automation/src/libSDLtest/fuzzer/utl_md5.h
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_md5.h → test/test-automation/src/libSDLtest/fuzzer/utl_md5.h
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_random.c → test/test-automation/src/libSDLtest/fuzzer/utl_random.c
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_random.c → test/test-automation/src/libSDLtest/fuzzer/utl_random.c
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_random.h → test/test-automation/src/libSDLtest/fuzzer/utl_random.h
Executable file → Normal file
0
test/test-automation/src/libtest/fuzzer/utl_random.h → test/test-automation/src/libSDLtest/fuzzer/utl_random.h
Executable file → Normal file
|
@ -1,7 +1,7 @@
|
|||
INCLUDE = -I../libtest -I../../include
|
||||
INCLUDE = -I../libSDLtest -I../../include
|
||||
|
||||
bin_PROGRAMS = runner
|
||||
runner_SOURCES = runner.c support.c
|
||||
runner_LDADD = ../libtest/libtest.la
|
||||
runner_LDADD = ../libSDLtest/libSDLtest.la
|
||||
runner_CFLAGS = -W -Wall -Wextra -g `sdl-config --cflags` -DSDL_NO_COMPAT
|
||||
runner_LDFLAGS = `sdl-config --libs`
|
||||
|
|
|
@ -32,10 +32,10 @@
|
|||
#include "../../include/SDL_test.h"
|
||||
#include "../../config.h"
|
||||
|
||||
#include "../libtest/fuzzer/fuzzer.h"
|
||||
#include "../libSDLtest/fuzzer/fuzzer.h"
|
||||
|
||||
#include "../libtest/plain_logger.h"
|
||||
#include "../libtest/xml_logger.h"
|
||||
#include "../libSDLtest/plain_logger.h"
|
||||
#include "../libSDLtest/xml_logger.h"
|
||||
|
||||
#include "logger.h"
|
||||
#include "support.h"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
lib_LTLIBRARIES = libtestaudio.la
|
||||
libtestaudio_la_SOURCES = testaudio.c
|
||||
libtestaudio_la_CLAGS = -fPIC -g
|
||||
libtestaudio_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
|
||||
libtestaudio_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
lib_LTLIBRARIES = libtestdummy.la
|
||||
libtestdummy_la_SOURCES = testdummy.c
|
||||
libtestdummy_la_CLAGS = -fPIC -g
|
||||
libtestdummy_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
|
||||
libtestdummy_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
lib_LTLIBRARIES = libtestplatform.la
|
||||
libtestplatform_la_SOURCES = testplatform.c
|
||||
libtestplatform_la_CLAGS = -fPIC -g
|
||||
libtestplatform_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
|
||||
libtestplatform_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
lib_LTLIBRARIES = libtestrect.la
|
||||
libtestrect_la_SOURCES = testrect.c
|
||||
libtestrect_la_CLAGS = -fPIC -g
|
||||
libtestrect_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
|
||||
libtestrect_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
lib_LTLIBRARIES = libtestrender.la
|
||||
libtestrender_la_SOURCES = testrender.c
|
||||
libtestrender_la_CLAGS = -fPIC -g
|
||||
libtestrender_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
|
||||
libtestrender_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
lib_LTLIBRARIES = libtestrwops.la
|
||||
libtestrwops_la_SOURCES = testrwops.c
|
||||
libtestrwops_la_CLAGS = -fPIC -g
|
||||
libtestrwops_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
|
||||
libtestrwops_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
lib_LTLIBRARIES = libtestsurface.la
|
||||
libtestsurface_la_SOURCES = testsurface.c
|
||||
libtestsurface_la_CLAGS = -fPIC -g
|
||||
libtestsurface_la_LDFLAGS = `sdl-config --libs` -I ../../src/libtest/.libs/libtest.la
|
||||
libtestsurface_la_LDFLAGS = `sdl-config --libs` -I ../../src/libSDLtest/.libs/libSDLtest.la
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue