summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2012-09-06 22:18:23 +0200
committerAndreas Baumann <abaumann@yahoo.com>2012-09-06 22:18:23 +0200
commit13fc9a7da5111f4ddba942d3c6b6b8654ce395d6 (patch)
treee86210e3d939911e35f930a6dc73c3ebb591243b /tests
parentf5c586f7231f7e033c5528bcefea357e4e64441c (diff)
downloadcrawler-13fc9a7da5111f4ddba942d3c6b6b8654ce395d6.tar.gz
crawler-13fc9a7da5111f4ddba942d3c6b6b8654ce395d6.tar.bz2
more splitting into libcrawl, crawl binary
moved more public header to 'include' changed approach for dynamic linking on Windows
Diffstat (limited to 'tests')
-rwxr-xr-xtests/logger/Makefile.W324
-rwxr-xr-xtests/utils/Makefile.W325
-rwxr-xr-xtests/utils/test3.cpp2
3 files changed, 4 insertions, 7 deletions
diff --git a/tests/logger/Makefile.W32 b/tests/logger/Makefile.W32
index e499e28..783add0 100755
--- a/tests/logger/Makefile.W32
+++ b/tests/logger/Makefile.W32
@@ -5,7 +5,8 @@ SUBDIRS =
!INCLUDE $(TOPDIR)\makefiles\nmake\platform.mk
INCLUDE_CXXFLAGS = \
- /D_WIN32_WINNT=0x504
+ /D_WIN32_WINNT=0x504 \
+ /DSHARED
INCLUDE_DIRS = \
/I. \
@@ -16,7 +17,6 @@ INCLUDE_DIRS = \
INCLUDE_LDFLAGS = \
INCLUDE_LIBS = \
- $(TOPDIR)\src\crawler.lib \
$(TOPDIR)\src\logger\logger.lib \
Ws2_32.lib
diff --git a/tests/utils/Makefile.W32 b/tests/utils/Makefile.W32
index 03ea7ae..ec6f9e7 100755
--- a/tests/utils/Makefile.W32
+++ b/tests/utils/Makefile.W32
@@ -5,9 +5,8 @@ SUBDIRS =
!INCLUDE $(TOPDIR)\makefiles\nmake\platform.mk
INCLUDE_CXXFLAGS = \
- /D_WIN32_WINNT=0x504 \
- /DNODLL
-
+ /D_WIN32_WINNT=0x504
+
INCLUDE_DIRS = \
/I. \
/I$(TOPDIR)\src \
diff --git a/tests/utils/test3.cpp b/tests/utils/test3.cpp
index 2a9a37f..a07365a 100755
--- a/tests/utils/test3.cpp
+++ b/tests/utils/test3.cpp
@@ -30,8 +30,6 @@ class Logger : public Singleton< Logger >
}
};
-DEFINE_SINGLETON( Logger )
-
/* this works, and two loggers can coexist, but they have different type
class DerivedLogger : public Logger
{