diff --git a/.DS_Store b/.DS_Store
index f220cff52d4620b5bb5887cb0219e9042bc87650..ede7190ee834868720daa6162217a4127beda5c5 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Spelskelett-xcode.xcodeproj/project.xcworkspace/xcuserdata/viktorseverinsson.xcuserdatad/UserInterfaceState.xcuserstate b/Spelskelett-xcode.xcodeproj/project.xcworkspace/xcuserdata/viktorseverinsson.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 61914357f9aa232dc15a8a58ca001672b8fb87f8..0000000000000000000000000000000000000000
Binary files a/Spelskelett-xcode.xcodeproj/project.xcworkspace/xcuserdata/viktorseverinsson.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/xcode/.DS_Store b/xcode/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6fb7df7b5e88e08fe19bd06ad69b89b03fd936d5
Binary files /dev/null and b/xcode/.DS_Store differ
diff --git a/Spelskelett-xcode.entitlements b/xcode/Spelskelett-xcode.entitlements
similarity index 100%
rename from Spelskelett-xcode.entitlements
rename to xcode/Spelskelett-xcode.entitlements
diff --git a/Spelskelett-xcode.xcodeproj/project.pbxproj b/xcode/Spelskelett-xcode.xcodeproj/project.pbxproj
similarity index 98%
rename from Spelskelett-xcode.xcodeproj/project.pbxproj
rename to xcode/Spelskelett-xcode.xcodeproj/project.pbxproj
index 8aba9a91ed364f4d6c1b1b69bf49df2cd6f17947..b1d0c1f8afe98621477992c7dbf44359f7d61c89 100644
--- a/Spelskelett-xcode.xcodeproj/project.pbxproj
+++ b/xcode/Spelskelett-xcode.xcodeproj/project.pbxproj
@@ -30,7 +30,7 @@
0BDAF71F24585A4B00C4925A /* Ball.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ball.cpp; sourceTree = "<group>"; };
0BDAF72224585A4C00C4925A /* balls.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = balls.png; path = resources/images/balls.png; sourceTree = SOURCE_ROOT; };
0BDAF72424585A4C00C4925A /* font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = font.ttf; path = resources/fonts/font.ttf; sourceTree = SOURCE_ROOT; };
- 0BDAF72524585A4C00C4925A /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+ 0BDAF72524585A4C00C4925A /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../Makefile; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -74,7 +74,8 @@
0BDAF71824585A4B00C4925A /* Game_State.h */,
0BDAF71924585A4B00C4925A /* State.h */,
);
- path = include;
+ name = include;
+ path = ../include;
sourceTree = "<group>";
};
0BDAF71A24585A4B00C4925A /* src */ = {
@@ -86,7 +87,8 @@
0BDAF71E24585A4B00C4925A /* Game.cpp */,
0BDAF71F24585A4B00C4925A /* Ball.cpp */,
);
- path = src;
+ name = src;
+ path = ../src;
sourceTree = "<group>";
};
0BDAF72024585A4C00C4925A /* resources */ = {
@@ -95,7 +97,8 @@
0BDAF72124585A4C00C4925A /* images */,
0BDAF72324585A4C00C4925A /* fonts */,
);
- path = resources;
+ name = resources;
+ path = ../resources;
sourceTree = "<group>";
};
0BDAF72124585A4C00C4925A /* images */ = {
diff --git a/Spelskelett-xcode.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/xcode/Spelskelett-xcode.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from Spelskelett-xcode.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to xcode/Spelskelett-xcode.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Spelskelett-xcode.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/xcode/Spelskelett-xcode.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
similarity index 100%
rename from Spelskelett-xcode.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
rename to xcode/Spelskelett-xcode.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/xcode/Spelskelett-xcode.xcodeproj/project.xcworkspace/xcuserdata/viktorseverinsson.xcuserdatad/UserInterfaceState.xcuserstate b/xcode/Spelskelett-xcode.xcodeproj/project.xcworkspace/xcuserdata/viktorseverinsson.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000000000000000000000000000000000000..c7b1ddd54103ef050529f967ef3e77c8a91d9dfa
Binary files /dev/null and b/xcode/Spelskelett-xcode.xcodeproj/project.xcworkspace/xcuserdata/viktorseverinsson.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/xcode/Spelskelett-xcode.xcodeproj/xcshareddata/xcschemes/Spelskelett-xcode.xcscheme b/xcode/Spelskelett-xcode.xcodeproj/xcshareddata/xcschemes/Spelskelett-xcode.xcscheme
new file mode 100644
index 0000000000000000000000000000000000000000..a657605eda23c4fdd9c7eb664e313992e7b28a84
--- /dev/null
+++ b/xcode/Spelskelett-xcode.xcodeproj/xcshareddata/xcschemes/Spelskelett-xcode.xcscheme
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1140"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "0BDAF70324585A2700C4925A"
+ BuildableName = "Spelskelett-xcode"
+ BlueprintName = "Spelskelett-xcode"
+ ReferencedContainer = "container:Spelskelett-xcode.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "YES"
+ customWorkingDirectory = "/Users/viktorseverinsson/OneDrive - Linköpings universitet/TDDI82/projekt/test/testa-linux-xcode/Spelskelett-linux-xcode"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "0BDAF70324585A2700C4925A"
+ BuildableName = "Spelskelett-xcode"
+ BlueprintName = "Spelskelett-xcode"
+ ReferencedContainer = "container:Spelskelett-xcode.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "0BDAF70324585A2700C4925A"
+ BuildableName = "Spelskelett-xcode"
+ BlueprintName = "Spelskelett-xcode"
+ ReferencedContainer = "container:Spelskelett-xcode.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
diff --git a/Spelskelett-xcode.xcodeproj/xcuserdata/viktorseverinsson.xcuserdatad/xcschemes/xcschememanagement.plist b/xcode/Spelskelett-xcode.xcodeproj/xcuserdata/viktorseverinsson.xcuserdatad/xcschemes/xcschememanagement.plist
similarity index 100%
rename from Spelskelett-xcode.xcodeproj/xcuserdata/viktorseverinsson.xcuserdatad/xcschemes/xcschememanagement.plist
rename to xcode/Spelskelett-xcode.xcodeproj/xcuserdata/viktorseverinsson.xcuserdatad/xcschemes/xcschememanagement.plist