Skip to content

Commit

Permalink
Merge pull request #7654 from Memphiz/fix_unittest_compile
Browse files Browse the repository at this point in the history
[unittests] - fixed duplicate main function during linkage of unit tests
  • Loading branch information
Memphiz committed Jul 28, 2015
2 parents 342ecde + c68603d commit b64d92e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile.in
Expand Up @@ -56,7 +56,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/interfaces/python/python_binding.a \
xbmc/linux/linux.a \
xbmc/listproviders/listproviders.a \
xbmc/main/main.a \
xbmc/main/posix/MessagePrinter.a \
xbmc/media/media.a \
xbmc/messaging/messaging.a \
xbmc/music/dialogs/musicdialogs.a \
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -2512,6 +2512,7 @@ OUTPUT_FILES="Makefile \
xbmc/android/jni/Makefile \
xbmc/utils/Makefile \
xbmc/main/Makefile \
xbmc/main/posix/Makefile \
tools/darwin/Configurations/App.xcconfig \
tools/darwin/Configurations/Common.xcconfig \
tools/darwin/packaging/ios/mkdeb-ios.sh \
Expand Down
2 changes: 1 addition & 1 deletion tools/buildsteps/defaultenv
Expand Up @@ -10,7 +10,7 @@ TARBALLS=${TARBALLS:-"/opt/xbmc-tarballs"}

BINARY_ADDONS_ROOT=tools/depends/target
BINARY_ADDONS="binary-addons"
DEPLOYED_BINARY_ADDONS="-e addons"
DEPLOYED_BINARY_ADDONS="-e /addons"

#set platform defaults
#$XBMC_PLATFORM_DIR matches the platform subdirs!
Expand Down
7 changes: 7 additions & 0 deletions xbmc/main/posix/Makefile.in
@@ -0,0 +1,7 @@
.SUFFIXES : .cpp

SRCS = MessagePrinter.cpp
LIB=MessagePrinter.a

include @abs_top_srcdir@/Makefile.include
-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))

0 comments on commit b64d92e

Please sign in to comment.