[codeshuffle] - moved main to platform/posix

11 files changed, 22 insertions, 25 deletions

diff --git a/.gitignore b/.gitignore
index 6f623d8277..f55ebc83e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -548,8 +548,8 @@ lib/cpluff/stamp-h1
 /xbmc/linux/Makefile
 /xbmc/linux/sse4/Makefile
 
-# /xbmc/main/
-/xbmc/main/Makefile
+# /xbmc/platform/posix
+/xbmc/platform/posix/Makefile
 
 # /xbmc/platform
 /xbmc/platform/Makefile
diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
index 3d8cce8133..b3d9da2c40 100644
--- a/Kodi.xcodeproj/project.pbxproj
+++ b/Kodi.xcodeproj/project.pbxproj
@@ -241,7 +241,6 @@
 		43348AAF1077486D00F859CF /* PlayerSelectionRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43348AAA1077486D00F859CF /* PlayerSelectionRule.cpp */; };
 		551C3A45175A12010051AAAD /* VDA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 551C3A43175A12010051AAAD /* VDA.cpp */; };
 		552840CC1626163B00ED1333 /* UPnPPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 552840CA1626163B00ED1333 /* UPnPPlayer.cpp */; settings = {COMPILER_FLAGS = "-I$SRCROOT/lib/libUPnP -I$SRCROOT/lib/libUPnP/Neptune/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Core -I$SRCROOT/lib/libUPnP/Platinum/Source/Platinum  -I$SRCROOT/lib/libUPnP/Platinum/Source/Extras -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaServer -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaConnect -I$SRCROOT/lib/libUPnP/Platinum/Source/Devices/MediaRenderer"; }; };
-		552A226915F7E14B0015C0D0 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 552A226815F7E14B0015C0D0 /* main.cpp */; };
 		5558ED10176396CD00118C35 /* StereoscopicsManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5558ED0E176396CD00118C35 /* StereoscopicsManager.cpp */; };
 		55611BA31766672F00754072 /* RenderFlags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55611BA21766672F00754072 /* RenderFlags.cpp */; };
 		55D3604E1826CAB900DA66D2 /* OverlayRendererGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 55D3604C1826CAB900DA66D2 /* OverlayRendererGUI.cpp */; };
@@ -816,6 +815,7 @@
 		DF91E93A1C0A21D60011084D /* xbmc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF91E9381C0A21D60011084D /* xbmc.cpp */; };
 		DF91E93B1C0A21D60011084D /* xbmc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF91E9381C0A21D60011084D /* xbmc.cpp */; };
 		DF91E93E1C0A26350011084D /* SDLMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = DF91E93D1C0A26350011084D /* SDLMain.mm */; };
+		DF91E9401C0A29530011084D /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF91E93F1C0A29530011084D /* main.cpp */; };
 		DF923E5D1A11536A008CDB0C /* DataCacheCore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF923E5B1A11536A008CDB0C /* DataCacheCore.cpp */; };
 		DF923E5E1A11536A008CDB0C /* DataCacheCore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF923E5B1A11536A008CDB0C /* DataCacheCore.cpp */; };
 		DF93D69A1444A8B1007C6459 /* DirectoryCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6651444A8B0007C6459 /* DirectoryCache.cpp */; };
@@ -2661,7 +2661,6 @@
 		551C3A44175A12010051AAAD /* VDA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VDA.h; sourceTree = "<group>"; };
 		552840CA1626163B00ED1333 /* UPnPPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPPlayer.cpp; sourceTree = "<group>"; };
 		552840CB1626163B00ED1333 /* UPnPPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPPlayer.h; sourceTree = "<group>"; };
-		552A226815F7E14B0015C0D0 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = main/main.cpp; sourceTree = "<group>"; };
 		5558ED0E176396CD00118C35 /* StereoscopicsManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StereoscopicsManager.cpp; sourceTree = "<group>"; };
 		5558ED0F176396CD00118C35 /* StereoscopicsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StereoscopicsManager.h; sourceTree = "<group>"; };
 		55611BA21766672F00754072 /* RenderFlags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderFlags.cpp; sourceTree = "<group>"; };
@@ -3655,6 +3654,7 @@
 		DF91E9391C0A21D60011084D /* xbmc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xbmc.h; sourceTree = "<group>"; };
 		DF91E93C1C0A26350011084D /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = "<group>"; };
 		DF91E93D1C0A26350011084D /* SDLMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SDLMain.mm; sourceTree = "<group>"; };
+		DF91E93F1C0A29530011084D /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
 		DF923E5B1A11536A008CDB0C /* DataCacheCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DataCacheCore.cpp; sourceTree = "<group>"; };
 		DF923E5C1A11536A008CDB0C /* DataCacheCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataCacheCore.h; sourceTree = "<group>"; };
 		DF93D6651444A8B0007C6459 /* DirectoryCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryCache.cpp; sourceTree = "<group>"; };
@@ -5926,14 +5926,6 @@
 			path = osx;
 			sourceTree = "<group>";
 		};
-		552A226615F7E11B0015C0D0 /* main */ = {
-			isa = PBXGroup;
-			children = (
-				552A226815F7E14B0015C0D0 /* main.cpp */,
-			);
-			name = main;
-			sourceTree = "<group>";
-		};
 		7C14096E18322476009F9411 /* lib */ = {
 			isa = PBXGroup;
 			children = (
@@ -7201,6 +7193,7 @@
 		DFD717231C09EDCE0025D964 /* posix */ = {
 			isa = PBXGroup;
 			children = (
+				DF91E93F1C0A29530011084D /* main.cpp */,
 				DFD717241C09EDCE0025D964 /* MessagePrinter.cpp */,
 			);
 			path = posix;
@@ -7355,7 +7348,6 @@
 				4367217312D6640E002508E6 /* interfaces */,
 				E38E1D690D25F9FD00618676 /* linux */,
 				7C430161175C41FE009B82E5 /* listproviders */,
-				552A226615F7E11B0015C0D0 /* main */,
 				7CF0504F191195DA00222135 /* media */,
 				DF4A3BAC1B4B0FC100F9CDC0 /* messaging */,
 				18B7C853129423A7009E7A26 /* music */,
@@ -9333,6 +9325,7 @@
 				3994426E1A8DD920006C39E9 /* VideoLibraryCleaningJob.cpp in Sources */,
 				E38E20A00D25F9FD00618676 /* GUIDialogVisualisationPresetList.cpp in Sources */,
 				E38E20A20D25F9FD00618676 /* GUIDialogVolumeBar.cpp in Sources */,
+				DF91E9401C0A29530011084D /* main.cpp in Sources */,
 				E38E20A30D25F9FD00618676 /* GUIDialogYesNo.cpp in Sources */,
 				E38E20A40D25F9FD00618676 /* GUILargeTextureManager.cpp in Sources */,
 				E38E20A50D25F9FD00618676 /* GUIMediaWindow.cpp in Sources */,
@@ -9921,7 +9914,6 @@
 				DFC6F4B61AFF7CB10039A7FA /* kiss_fft.c in Sources */,
 				36A9466A15CF1FED00727135 /* UrlOptions.cpp in Sources */,
 				36A9466D15CF201F00727135 /* VideoDbUrl.cpp in Sources */,
-				552A226915F7E14B0015C0D0 /* main.cpp in Sources */,
 				DF2345E115FA639500A934F6 /* UPnP.cpp in Sources */,
 				DF2345E215FA639500A934F6 /* UPnPInternal.cpp in Sources */,
 				552840CC1626163B00ED1333 /* UPnPPlayer.cpp in Sources */,
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)
diff --git a/configure.ac b/configure.ac
index a352e0f0f0..22206bacf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2407,11 +2407,12 @@ OUTPUT_FILES="Makefile \
     tools/EventClients/Clients/OSXRemote/Makefile \
     xbmc/peripherals/bus/Makefile \
     xbmc/peripherals/devices/Makefile \
+    xbmc/platform/posix/Makefile \
+    xbmc/platform/darwin/osx/Makefile \
     xbmc/platform/android/activity/Makefile \
     xbmc/platform/android/loader/Makefile \
     xbmc/platform/android/jni/Makefile \
     xbmc/utils/Makefile \
-    xbmc/main/Makefile \
     xbmc/platform/Makefile \
     tools/darwin/Configurations/App.xcconfig \
     tools/darwin/Configurations/Common.xcconfig \
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index ca17582ed7..567698cf30 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -647,7 +647,7 @@
     <ClCompile Include="..\..\xbmc\listproviders\IListProvider.cpp" />
     <ClCompile Include="..\..\xbmc\listproviders\DirectoryProvider.cpp" />
     <ClCompile Include="..\..\xbmc\listproviders\StaticProvider.cpp" />
-    <ClCompile Include="..\..\xbmc\main\main.cpp">
+    <ClCompile Include="..\..\xbmc\platform\posix\main.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\platform\win32\MessagePrinter.cpp" />
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index 0883afaab6..bc00b36012 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -88,6 +88,9 @@
     <Filter Include="platform">
       <UniqueIdentifier>{90dd91e6-b726-4f88-803a-84156a663713}</UniqueIdentifier>
     </Filter>
+    <Filter Include="platform\posix">
+      <UniqueIdentifier>{4af60343-ab33-42c9-8752-b7898e9b5b86}</UniqueIdentifier>
+    </Filter>
     <Filter Include="platform\win32">
       <UniqueIdentifier>{9312ce72-49ff-422a-8e3a-05c0a2a534d5}</UniqueIdentifier>
     </Filter>
@@ -3072,8 +3075,8 @@
     <ClCompile Include="..\..\xbmc\pictures\PictureScalingAlgorithm.cpp">
       <Filter>pictures</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\main\main.cpp">
-      <Filter>main</Filter>
+    <ClCompile Include="..\..\xbmc\platform\posix\main.cpp">
+      <Filter>platform\posix</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\platform\win32\WinMain.cpp">
       <Filter>platform\win32</Filter>
diff --git a/xbmc/platform/Makefile.in b/xbmc/platform/Makefile.in
index 2fab8507e9..e70ca60b15 100644
--- a/xbmc/platform/Makefile.in
+++ b/xbmc/platform/Makefile.in
@@ -13,7 +13,6 @@ SRCS += darwin/osx/OSXTextInputResponder.mm
 SRCS += darwin/osx/smc.c
 SRCS += darwin/osx/XBMCHelper.m
 SRCS += darwin/osx/CocoaInterface.mm
-SRCS += darwin/osx/SDLMain.mm
 endif
 
 LIB=platform.a
diff --git a/xbmc/platform/darwin/osx/Makefile.in b/xbmc/platform/darwin/osx/Makefile.in
index 8fd0312c98..47873fe534 100644
--- a/xbmc/platform/darwin/osx/Makefile.in
+++ b/xbmc/platform/darwin/osx/Makefile.in
@@ -1,6 +1,6 @@
 .SUFFIXES : .mm
 
-SRCS = darwin/osx/SDLMain.mm
+SRCS = SDLMain.mm
 
 LIB=sdlmain.a
 
diff --git a/xbmc/main/Makefile.in b/xbmc/platform/posix/Makefile.in
index 1e7d90f873..0e6d5e8b14 100644
--- a/xbmc/main/Makefile.in
+++ b/xbmc/platform/posix/Makefile.in
@@ -1,9 +1,8 @@
 .SUFFIXES : .m .mm .cpp
 
 SRCS  = main.cpp
-SRCS += posix/MessagePrinter.cpp
 
-LIB=main.a
+LIB=posix.a
 
 include @abs_top_srcdir@/Makefile.include
 -include $(patsubst %.mm,%.P,$(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS))))
diff --git a/xbmc/main/main.cpp b/xbmc/platform/posix/main.cpp
index b6b7035674..b6b7035674 100644
--- a/xbmc/main/main.cpp
+++ b/xbmc/platform/posix/main.cpp
diff --git a/xbmc/platform/win32/WinMain.cpp b/xbmc/platform/win32/WinMain.cpp
index 38488a0564..9f24a1e79b 100644
--- a/xbmc/platform/win32/WinMain.cpp
+++ b/xbmc/platform/win32/WinMain.cpp
@@ -21,7 +21,7 @@
 #include "CompileInfo.h"
 #include "threads/Thread.h"
 #include "threads/platform/win/Win32Exception.h"
-#include "xbmc.h"
+#include "platform/xbmc.h"
 #include "utils/CPUInfo.h"
 #include "utils/Environment.h"