Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2248/mockpp/tests
Modified Files:
Makefile.am
Log Message:
prepared win32 version
Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/Makefile.am,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- Makefile.am 11 Dec 2005 20:03:44 -0000 1.94
+++ Makefile.am 11 Dec 2005 20:09:53 -0000 1.95
@@ -7,6 +7,7 @@
AM_LDFLAGS = $(all_libraries)
+#mock_test_win32
check_PROGRAMS = mock_test \
mock_test_qt mock_test_x11 \
jmock_test \
@@ -22,37 +23,24 @@
AM_CXXFLAGS = -I$(QTDIR)/include -I/usr/X11R6/include
-#readability_CXXFLAGS =
-
-#check_inst_CXXFLAGS =
-
-#mock_test_CXXFLAGS =
-
-#jmock_test_CXXFLAGS =
-
-#mock_test_qt_CXXFLAGS = -I$(QTDIR)/include -DGUI_QT
-
-#mock_test_x11_CXXFLAGS = -I/usr/X11R6/include -DGUI_X11
-
###########################################################################
if BUILTIN_CXXTEST
cxxtest_lib=$(top_builddir)/3party/cxxtest/cxxtest/libmockpp_cxxtest.la
endif
-#libmocktesting.la
mock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \
$(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB)
-#libmocktesting.la
mock_test_qt_LDADD = $(top_builddir)/mockpp/libmockpp.la \
$(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) -lqt-mt
-#libmocktesting.la
mock_test_x11_LDADD = $(top_builddir)/mockpp/libmockpp.la \
$(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) -lX11
-#libjmocktesting.la
+#mock_test_win32_LDADD = $(top_builddir)/mockpp/libmockpp.la \
+# $(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB) -lwindows
+
jmock_test_LDADD = $(top_builddir)/mockpp/libmockpp.la \
$(cxxtest_lib) $(LIBDL) -lstdc++ $(EA_EXTRA_LIB)
@@ -74,8 +62,6 @@
###########################################################################
-#noinst_LTLIBRARIES = libmocktesting.la libjmocktesting.la
-
libmocktesting_la_SOURCES = \
VisitableMockObject_test.cpp \
Formatter_test.cpp Throwable_test.cpp ThrowableList_test.cpp ExpectationCounter_test.cpp \
@@ -121,6 +107,8 @@
mock_test_x11_SOURCES = mock_test_x11.cpp $(libmocktesting_la_SOURCES)
+mock_test_win32_SOURCES = mock_test_win32.cpp $(libmocktesting_la_SOURCES)
+
mock_test_SOURCES = mock_test.cpp $(libmocktesting_la_SOURCES)
jmock_test_SOURCES = mock_test.cpp $(libjmocktesting_la_SOURCES)
@@ -141,6 +129,8 @@
mock_test_x11_LDFLAGS = -L/opt/intel_cc_80/lib -L/usr/X11R6/lib
+mock_test_win32_LDFLAGS = -L/opt/intel_cc_80/lib -L/windows
+
readability_test_LDFLAGS = -L/opt/intel_cc_80/lib
check_inst_LDFLAGS = -L/opt/intel_cc_80/lib
|
