diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2015-08-31 17:03:04 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2015-08-31 17:03:04 +0000 |
| commit | 4c4aa185f344bc3037edc42a80ab795fbdbd3dbc (patch) | |
| tree | d03f19888a695a8a518359f6203fbd6554d34d2b /slideshow | |
| parent | 0c0bb56d4d08f918d0df1b43a5c2b01177ca51af (diff) | |
Correct the dependencies for main/slideshow tests which sometimes breaks the build,
as if util isn't built before test libslideshow.so is unavailable to link with.
Also don't include the gtest main() function for the demoshow "test"; it doesn't
link even with this patch but at least it doesn't complain about missing gtest
APIs but only about a missing main().
Notes
Notes:
ignore: googletest
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/prj/build.lst | 2 | ||||
| -rw-r--r-- | slideshow/test/makefile.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst index 1de750626749..d3db04a8a0ef 100644 --- a/slideshow/prj/build.lst +++ b/slideshow/prj/build.lst @@ -9,4 +9,4 @@ pe slideshow\source\engine\transitions nmake - all pe_transitions pe_inc NULL pe slideshow\source\engine\animationnodes nmake - all pe_animationnodes pe_inc NULL pe slideshow\source\engine\activities nmake - all pe_activities pe_inc NULL pe slideshow\util nmake - all pe_util pe_shapes pe_slide pe_activities pe_animationnodes pe_transitions pe_engine NULL -pe slideshow\test nmake - all pe_test pe_shapes pe_slide pe_activities pe_animationnodes pe_transitions pe_engine pe_inc NULL +pe slideshow\test nmake - all pe_test pe_util pe_inc NULL diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk index c9b662212704..32b2a50a03b0 100644 --- a/slideshow/test/makefile.mk +++ b/slideshow/test/makefile.mk @@ -76,8 +76,7 @@ APP1TEST = enabled # BEGIN target2 -------------------------------------------------------- APP2OBJS= \ - $(SLO)$/demoshow.obj \ - $(SLO)$/main.obj + $(SLO)$/demoshow.obj APP2TARGET= demoshow APP2STDLIBS=$(TOOLSLIB) \ |