Kaydet (Commit) 4c4aa185 authored tarafından Damjan Jovanovic's avatar Damjan Jovanovic

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().
üst 0c0bb56d
...@@ -9,4 +9,4 @@ pe slideshow\source\engine\transitions nmake - all pe_transitions pe_inc NULL ...@@ -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\animationnodes nmake - all pe_animationnodes pe_inc NULL
pe slideshow\source\engine\activities nmake - all pe_activities 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\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
...@@ -76,8 +76,7 @@ APP1TEST = enabled ...@@ -76,8 +76,7 @@ APP1TEST = enabled
# BEGIN target2 -------------------------------------------------------- # BEGIN target2 --------------------------------------------------------
APP2OBJS= \ APP2OBJS= \
$(SLO)$/demoshow.obj \ $(SLO)$/demoshow.obj
$(SLO)$/main.obj
APP2TARGET= demoshow APP2TARGET= demoshow
APP2STDLIBS=$(TOOLSLIB) \ APP2STDLIBS=$(TOOLSLIB) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment