aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2015-11-28 19:26:33 +0100
committerMemphiz <memphis@machzwo.de>2015-12-12 11:49:41 +0100
commit4d6883aeef76bfeb880de31f2d57adc074e5f8e3 (patch)
tree6e847a2f9447fe75c91a0120ec215b7a44b8a0a7 /Makefile.in
parentf96dedcea8ebdb60cbf5f19b45842eed226a1602 (diff)
[codeshuffle] - moved main to platform/posix
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 073918c5de..0821b7e610 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -395,7 +395,10 @@ endif
ifeq (@USE_ANDROID@,1)
MAINOBJS+=xbmc/platform/android/activity/activity.a
else
-MAINOBJS+=xbmc/main/main.a
+MAINOBJS+=xbmc/platform/posix/posix.a
+ifeq ($(findstring osx,@ARCH@), osx)
+MAINOBJS+=xbmc/platform/darwin/osx/sdlmain.a
+endif
endif # USE_ANDROID
@@ -405,7 +408,7 @@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC))
BIN_DIRS = $(dir $(DIRECTORY_ARCHIVES)) $(dir $(NWAOBJSXBMC)) $(dir $(MAINOBJS))
DIRS= $(BIN_DIRS) $(EC_DIRS) $(DVDPCODECS_DIRS) \
- $(LIB_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main
+ $(LIB_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/platform xbmc/platform/darwin/osx
$(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force
@$(MAKE) $(if $(V),,-s) -C $(@D)