diff --git a/.gitignore b/.gitignore index 4058536..0a694cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store xcuserdata/ ActiveGS_AsmJS/out +contents.xcworkspacedata diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/Contents.json b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/Contents.json index 71fddbe..9a7efcc 100644 --- a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -38,33 +48,49 @@ "scale" : "2x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", + "filename" : "icon@120.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", + "filename" : "icon@180.png", "scale" : "3x" }, { "idiom" : "ipad", - "size" : "29x29", + "size" : "20x20", "scale" : "1x" }, { + "size" : "20x20", "idiom" : "ipad", - "size" : "29x29", + "filename" : "icon@40-1.png", "scale" : "2x" }, { "idiom" : "ipad", - "size" : "40x40", + "size" : "29x29", "scale" : "1x" }, { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "icon@58-1.png", + "scale" : "2x" + }, + { + "size" : "40x40", "idiom" : "ipad", + "filename" : "icon@40.png", + "scale" : "1x" + }, + { "size" : "40x40", + "idiom" : "ipad", + "filename" : "icon@80.png", "scale" : "2x" }, { @@ -78,29 +104,32 @@ "scale" : "2x" }, { - "size" : "72x72", "idiom" : "ipad", - "filename" : "icon72.png", + "size" : "72x72", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "72x72", + "idiom" : "ipad", + "filename" : "icon@144.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", + "filename" : "icon76.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", + "filename" : "icon@152.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "icon@167.png", "scale" : "2x" } ], diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon76.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon76.png new file mode 100644 index 0000000..689c058 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon76.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@120.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@120.png new file mode 100644 index 0000000..b3e200e Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@120.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@144.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@144.png new file mode 100644 index 0000000..ac285e4 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@144.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@152.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@152.png new file mode 100644 index 0000000..d025519 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@152.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@167.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@167.png new file mode 100644 index 0000000..c35220a Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@167.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@180.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@180.png new file mode 100644 index 0000000..cc604b6 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@180.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@40-1.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@40-1.png new file mode 100644 index 0000000..abb1a74 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@40-1.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@40.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@40.png new file mode 100644 index 0000000..abb1a74 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@40.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@58-1.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@58-1.png new file mode 100644 index 0000000..abd158e Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@58-1.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@80.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@80.png new file mode 100644 index 0000000..a6c078d Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/AppIcon.appiconset/icon@80.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Contents.json b/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Contents.json index ec2b6b2..de82dbe 100644 --- a/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Contents.json +++ b/ActiveGS_iOS/ActiveGS/Images.xcassets/Brand Assets.launchimage/Contents.json @@ -1,37 +1,13 @@ { "images" : [ - { - "idiom" : "iphone", - "scale" : "2x", - "orientation" : "portrait" - }, { "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default.png", + "idiom" : "ipad", + "extent" : "to-status-bar", "scale" : "1x" }, { - "orientation" : "portrait", - "idiom" : "iphone", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "minimum-system-version" : "7.0", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "orientation" : "portrait", + "orientation" : "landscape", "idiom" : "ipad", "extent" : "to-status-bar", "scale" : "1x" @@ -42,12 +18,6 @@ "extent" : "to-status-bar", "scale" : "2x" }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "1x" - }, { "orientation" : "landscape", "idiom" : "ipad", @@ -57,29 +27,53 @@ { "orientation" : "portrait", "idiom" : "ipad", + "extent" : "full-screen", "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", "extent" : "full-screen", + "minimum-system-version" : "7.0", "scale" : "1x" }, { "orientation" : "portrait", "idiom" : "ipad", - "minimum-system-version" : "7.0", "extent" : "full-screen", + "minimum-system-version" : "7.0", "scale" : "2x" }, { "orientation" : "landscape", "idiom" : "ipad", - "minimum-system-version" : "7.0", "extent" : "full-screen", - "scale" : "1x" + "minimum-system-version" : "7.0", + "scale" : "2x" }, { - "orientation" : "landscape", - "idiom" : "ipad", + "idiom" : "iphone", + "scale" : "2x", + "orientation" : "portrait" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", "minimum-system-version" : "7.0", - "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "minimum-system-version" : "7.0", + "subtype" : "retina4", "scale" : "2x" } ], diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/Contents.json b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/Contents.json index cd932b4..a38f522 100644 --- a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -1,141 +1,152 @@ { "images" : [ { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "736h", - "filename" : "activegs-launch-iphone6plus.png", - "minimum-system-version" : "8.0", "orientation" : "portrait", - "scale" : "3x" - }, - { - "orientation" : "landscape", "idiom" : "iphone", "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "736h", - "scale" : "3x" + "scale" : "1x" }, { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "667h", - "filename" : "activegs-launch-iphone6.png", - "minimum-system-version" : "8.0", "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", "scale" : "2x" }, { "orientation" : "portrait", "idiom" : "iphone", - "filename" : "activegs-launch-iphone4s.png", "extent" : "full-screen", - "minimum-system-version" : "7.0", + "subtype" : "retina4", "scale" : "2x" }, { - "extent" : "full-screen", - "idiom" : "iphone", - "subtype" : "retina4", - "filename" : "activegs-launch-iphone5.png", - "minimum-system-version" : "7.0", "orientation" : "portrait", - "scale" : "2x" + "idiom" : "ipad", + "filename" : "activegs-launch-iPadios5.png", + "extent" : "to-status-bar", + "scale" : "1x" }, { "orientation" : "portrait", "idiom" : "ipad", + "filename" : "activegs-launch-iPad-ios5.png", "extent" : "full-screen", - "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "activegs-launch-iPadland-ios5.png", + "extent" : "to-status-bar", "scale" : "1x" }, { "orientation" : "landscape", "idiom" : "ipad", "extent" : "full-screen", - "minimum-system-version" : "7.0", "scale" : "1x" }, { "orientation" : "portrait", "idiom" : "ipad", + "filename" : "activegs-launch-iPadretina-ios5.png", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "activegs-launch-iPadretina-ios5-1.png", "extent" : "full-screen", - "minimum-system-version" : "7.0", "scale" : "2x" }, { "orientation" : "landscape", "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", + "filename" : "activegs-launch-iPadretinaland-iOS5.png", + "extent" : "to-status-bar", "scale" : "2x" }, { - "orientation" : "portrait", - "idiom" : "iphone", + "orientation" : "landscape", + "idiom" : "ipad", "extent" : "full-screen", - "scale" : "1x" + "scale" : "2x" }, { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "736h", + "filename" : "activegs-launch-iphone6plus.png", + "minimum-system-version" : "8.0", "orientation" : "portrait", + "scale" : "3x" + }, + { + "extent" : "full-screen", "idiom" : "iphone", + "subtype" : "736h", + "filename" : "activegs-launch-iphone6land.png", + "minimum-system-version" : "8.0", + "orientation" : "landscape", + "scale" : "3x" + }, + { "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "667h", + "filename" : "activegs-launch-iphone6.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", "scale" : "2x" }, { "orientation" : "portrait", "idiom" : "iphone", + "filename" : "activegs-launch-iphone4s.png", "extent" : "full-screen", - "subtype" : "retina4", + "minimum-system-version" : "7.0", "scale" : "2x" }, { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "retina4", + "filename" : "activegs-launch-iphone5.png", + "minimum-system-version" : "7.0", "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "1x" + "scale" : "2x" }, { "orientation" : "portrait", "idiom" : "ipad", + "filename" : "activegs-launch-iPad.png", "extent" : "full-screen", + "minimum-system-version" : "7.0", "scale" : "1x" }, { "orientation" : "landscape", "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", + "filename" : "activegs-launch-iPadland.png", "extent" : "full-screen", + "minimum-system-version" : "7.0", "scale" : "1x" }, { "orientation" : "portrait", "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", + "filename" : "activegs-launch-iPadretina.png", "extent" : "full-screen", + "minimum-system-version" : "7.0", "scale" : "2x" }, { "orientation" : "landscape", "idiom" : "ipad", - "extent" : "to-status-bar", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", + "filename" : "activegs-launch-iPadretinaland.png", "extent" : "full-screen", + "minimum-system-version" : "7.0", "scale" : "2x" } ], diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPad-ios5.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPad-ios5.png new file mode 100644 index 0000000..4626926 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPad-ios5.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPad.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPad.png new file mode 100644 index 0000000..4626926 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPad.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadios5.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadios5.png new file mode 100644 index 0000000..a6fc1b9 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadios5.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadland-ios5.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadland-ios5.png new file mode 100644 index 0000000..df16d74 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadland-ios5.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadland.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadland.png new file mode 100644 index 0000000..77a5003 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadland.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretina-ios5-1.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretina-ios5-1.png new file mode 100644 index 0000000..fe802ae Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretina-ios5-1.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretina-ios5.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretina-ios5.png new file mode 100644 index 0000000..ee1ddc1 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretina-ios5.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretina.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretina.png new file mode 100644 index 0000000..fe802ae Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretina.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretinaland-iOS5.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretinaland-iOS5.png new file mode 100644 index 0000000..93a2635 Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretinaland-iOS5.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretinaland.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretinaland.png new file mode 100644 index 0000000..93daa7e Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iPadretinaland.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone4s.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone4s.png index e6a4813..9c1d107 100644 Binary files a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone4s.png and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone4s.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone5.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone5.png index eba0b20..2434568 100644 Binary files a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone5.png and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone5.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6.png index adbd7ab..5d04ac9 100644 Binary files a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6.png and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6land.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6land.png new file mode 100644 index 0000000..55ea81d Binary files /dev/null and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6land.png differ diff --git a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6plus.png b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6plus.png index 9c4920b..6049b8c 100644 Binary files a/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6plus.png and b/ActiveGS_iOS/ActiveGS/Images.xcassets/LaunchImage.launchimage/activegs-launch-iphone6plus.png differ diff --git a/ActiveGS_iOS/activegs.plist b/ActiveGS_iOS/activegs.plist index a21d917..332f5fd 100644 --- a/ActiveGS_iOS/activegs.plist +++ b/ActiveGS_iOS/activegs.plist @@ -6,6 +6,63 @@ English CFBundleDisplayName ActiveGS + CFBundleDocumentTypes + + + CFBundleTypeIconFiles + + CFBundleTypeName + Apple // 2MG Image + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + com.apple.disk-image-2mg + + + + CFBundleTypeIconFiles + + CFBundleTypeName + Apple // DSK Image + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + com.apple.disk-image-dsk + + + + CFBundleTypeIconFiles + + CFBundleTypeName + Apple // ZIP Disk Image + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + com.apple.disk-image-zip + + + + CFBundleTypeIconFiles + + CFBundleTypeName + Unknown File + LSHandlerRank + Alternate + LSItemContentTypes + + public.item + + + CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier @@ -17,7 +74,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.40 + 1.42 CFBundleSignature ???? CFBundleVersion @@ -35,6 +92,8 @@ UIFileSharingEnabled + UIRequiresFullScreen + UIStatusBarHidden UIStatusBarHidden~ipad @@ -48,5 +107,71 @@ UIViewControllerBasedStatusBarAppearance + UTExportedTypeDeclarations + + + UTTypeConformsTo + + public.archive + public-data + public.disk-image + + UTTypeDescription + Apple // Disk Image - 2MG + UTTypeIconFiles + + UTTypeIdentifier + com.apple.disk-image-2mg + UTTypeTagSpecification + + Item 0 + 2MG + public.filename-extension + + + + + UTTypeConformsTo + + public.archive + public-data + public.disk-image + + UTTypeDescription + Apple // Disk Image - DSK + UTTypeIconFiles + + UTTypeIdentifier + com.apple.disk-image-dsk + UTTypeTagSpecification + + public.filename-extension + + DSK + + + + + UTTypeConformsTo + + public.archive + public-data + public.disk-image + + UTTypeDescription + Apple // Disk Image -ZIP + UTTypeIconFiles + + UTTypeIdentifier + com.apple.disk-image-zip + UTTypeTagSpecification + + public.filename-extension + + ZIP + + + + diff --git a/ActiveGS_iOS/activegs.xcodeproj/project.pbxproj b/ActiveGS_iOS/activegs.xcodeproj/project.pbxproj index 089b3d0..08c772f 100644 --- a/ActiveGS_iOS/activegs.xcodeproj/project.pbxproj +++ b/ActiveGS_iOS/activegs.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 48; objects = { /* Begin PBXBuildFile section */ @@ -1125,9 +1125,10 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 0820; TargetAttributes = { 1D6058900D05DD3D006BFB54 = { + ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.DataProtection = { enabled = 0; @@ -1137,7 +1138,7 @@ }; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "activegs" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 8.0"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -1399,12 +1400,28 @@ 09A284A112383EE600EA12DF /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = c99; + GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; }; @@ -1419,7 +1436,9 @@ CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = ""; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; + DEVELOPMENT_TEAM = TFQRCMRWP4; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = activegs_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1434,14 +1453,15 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = activegs.plist; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/GraphicsServices.framework\"", ); - PRODUCT_BUNDLE_IDENTIFIER = com.freetoolsassociation.activegs; + PRODUCT_BUNDLE_IDENTIFIER = com.activeGS.test; PRODUCT_NAME = ActiveGS; PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -1457,7 +1477,9 @@ CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = ""; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + DEVELOPMENT_TEAM = TFQRCMRWP4; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1474,14 +1496,15 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = activegs.plist; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/GraphicsServices.framework\"", ); - PRODUCT_BUNDLE_IDENTIFIER = com.freetoolsassociation.activegs; + PRODUCT_BUNDLE_IDENTIFIER = com.activeGS.test; PRODUCT_NAME = ActiveGS; PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -1496,7 +1519,9 @@ CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_ENTITLEMENTS = ""; CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; + DEVELOPMENT_TEAM = TFQRCMRWP4; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = activegs_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1510,14 +1535,15 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = activegs.plist; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks/GraphicsServices.framework\"", ); - PRODUCT_BUNDLE_IDENTIFIER = com.freetoolsassociation.activegs; + PRODUCT_BUNDLE_IDENTIFIER = com.activeGS.test; PRODUCT_NAME = ActiveGS; PROVISIONING_PROFILE = ""; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -1527,13 +1553,29 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c99; + GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; @@ -1543,12 +1585,28 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = c99; + GCC_NO_COMMON_BLOCKS = YES; GCC_THUMB_SUPPORT = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 4.3; + IPHONEOS_DEPLOYMENT_TARGET = 10.3; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; }; diff --git a/ActiveGS_iOS/activegs.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ActiveGS_iOS/activegs.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index d25ed1f..0000000 --- a/ActiveGS_iOS/activegs.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/Common.iphone/KBDController.h b/Common.iphone/KBDController.h index 177ed9b..2043e7e 100644 --- a/Common.iphone/KBDController.h +++ b/Common.iphone/KBDController.h @@ -133,6 +133,7 @@ enum -(void)resetSpecialKeys; -(void)unloadSpecialKeys; - (void) animateDisk:(id)_id ; +-(void) animateDiskEjection:(id)_id; -(void)refreshControls:(id)sender; - (void) detectHardwareKeyboard:(id)_id ; - (void)setLoading:(NSNumber*)_nsvisible; diff --git a/Common.iphone/KBDController.mm b/Common.iphone/KBDController.mm index bb9be3c..be037e8 100644 --- a/Common.iphone/KBDController.mm +++ b/Common.iphone/KBDController.mm @@ -5,22 +5,22 @@ */ #import "KBDController.h" -#include "../kegs/src/defc.h" -#include "../kegs/src/protos_macdriver.h" -#include "../kegs/src/sim65816.h" -#include "../kegs/src/moremem.h" -#include "../kegs/src/adb.h" -#include "../kegs/src/sound.h" -#include "../kegs/src/async_event.h" +#include "../kegs/Src/defc.h" +#include "../kegs/Src/protos_macdriver.h" +#include "../kegs/Src/sim65816.h" +#include "../kegs/Src/moremem.h" +#include "../kegs/Src/adb.h" +#include "../kegs/Src/sound.h" +#include "../kegs/Src/async_event.h" #include "../Common/svnversion.h" #import "activegsAppDelegate.h" #import "activegsViewController.h" #import #import -#include "../kegs/src/paddles.h" +#include "../kegs/Src/paddles.h" #import "../kegs/iOS/emulatorView.h" -#include "../kegs/src/SaveState.h" -#include "../common/activedownload.h" +#include "../kegs/Src/SaveState.h" +#include "../Common/ActiveDownload.h" #import "MfiGameControllerHandler.h" #ifdef ACTIVEGS_CUSTOMKEYS diff --git a/Common.iphone/activegsAppDelegate.h b/Common.iphone/activegsAppDelegate.h index ddd6b52..1786c5f 100644 --- a/Common.iphone/activegsAppDelegate.h +++ b/Common.iphone/activegsAppDelegate.h @@ -8,7 +8,7 @@ #import #import -#include "../Common.osx/CEmulatorCtrlMac.h" +#include "../Common.osx/cemulatorctrlmac.h" #define IPHONETHUMB "thumb" @@ -42,7 +42,7 @@ #endif -#import "activeGSViewController.h" +#import "activegsViewController.h" #define ACTIVEGS_LAUNCHVIEWCONTROLLER activegsViewController #ifdef BESTOFFTA diff --git a/Common.iphone/activegsAppDelegate.mm b/Common.iphone/activegsAppDelegate.mm index 2768998..0c12638 100644 --- a/Common.iphone/activegsAppDelegate.mm +++ b/Common.iphone/activegsAppDelegate.mm @@ -6,9 +6,9 @@ #import "activegsAppDelegate.h" #include "../Common/svnversion.h" -#include "../Kegs/Src/adb.h" -#include "../Kegs/Src/sim65816.h" -#include "../Kegs/Src/driver.h" +#include "../kegs/Src/adb.h" +#include "../kegs/Src/sim65816.h" +#include "../kegs/Src/driver.h" #include "../Common/ki.h" #import #include "asynccommand.h" @@ -70,12 +70,14 @@ void x_notify_eject() @autoreleasepool { [[pManager getEmulatorView].kbdc performSelectorOnMainThread:@selector(animateDiskEjection:) withObject:nil waitUntilDone:NO]; } - } void x_set_video_fx(videofxenum _vfx) { - [pManager getEmulatorView].zv.crt.hidden = (_vfx==VIDEOFX_CRT?0:1); + @autoreleasepool { + [[pManager getEmulatorView] performSelectorOnMainThread:@selector(setVideoFx:) withObject:[NSNumber numberWithInt:_vfx] waitUntilDone:NO]; + } + } diff --git a/Common.iphone/activegsEmulatorController.h b/Common.iphone/activegsEmulatorController.h index 2efc766..1ddc5c1 100644 --- a/Common.iphone/activegsEmulatorController.h +++ b/Common.iphone/activegsEmulatorController.h @@ -69,6 +69,7 @@ enum attachMode #endif -(void) updateView; +-(void)setVideoFx: (NSNumber*)_vfxNumber; @property (nonatomic, strong) customView* contentView; @property (nonatomic, strong) zoomEmulatorView* zv; diff --git a/Common.iphone/activegsEmulatorController.mm b/Common.iphone/activegsEmulatorController.mm index 3d8df10..a0f7cb0 100644 --- a/Common.iphone/activegsEmulatorController.mm +++ b/Common.iphone/activegsEmulatorController.mm @@ -5,8 +5,8 @@ */ #import "activegsAppDelegate.h" -#include "../kegs/src/protos_macdriver.h" -#include "../kegs/src/sim65816.h" +#include "../kegs/Src/protos_macdriver.h" +#include "../kegs/Src/sim65816.h" #define TIME_BEFORE_REENABLING_GESTURES 1.0 #define TIME_BEFORE_DISABLING_GESTURES 0.5 @@ -672,10 +672,13 @@ -(void)viewWillDisappear:(BOOL)animated } - (void)dealloc { - - self.zv; self.zv = nil; +} +- (void)setVideoFx: (NSNumber*)_vfxNumber +{ + int vfx = [_vfxNumber intValue]; + self.zv.crt.hidden = (vfx==VIDEOFX_CRT?0:1); } @end diff --git a/Common.iphone/activegsList.mm b/Common.iphone/activegsList.mm index 8f149b5..44f51cd 100644 --- a/Common.iphone/activegsList.mm +++ b/Common.iphone/activegsList.mm @@ -10,7 +10,7 @@ #import "asyncimageview.h" #import "activegsViewController.h" //#include "../Common/3rdpartylib/tinyxml/tinyxml.h" -#include "../kegs/src/sim65816.h" +#include "../kegs/Src/sim65816.h" #include "asynccommand.h" extern void x_notify_download_failure(const char*_url); @@ -572,7 +572,27 @@ - (void)viewWillAppear:(BOOL)animated { NSLog(@"activeGSList viewWillAppear %@",self); - + + // Move files from Documents/Inbox to Documents (Items arriving through iOS "Open In" + NSLog(@"Moving files from Documents/Inbox to Documents so they're visible"); + //Turn every file inside the directory into an array + // Note to self: remember to actually put files in the Documents folder. Use the code in the apparopriately marked file + NSArray *path = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + //strings to actually get the directories + NSString *appFolderPath = [path objectAtIndex:0]; + NSString *inboxAppFolderPath = [appFolderPath stringByAppendingString:@"/Inbox"]; //add ".plist" to the end of the recipe name + + NSString *documentsDirectory = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]; + + NSArray *inboxContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[NSString stringWithFormat:inboxAppFolderPath, documentsDirectory] error:nil]; + + //move all the files over + for (int i = 0; i != [inboxContents count]; i++) { + NSString *oldPath = [NSString stringWithFormat:@"%@/%@", inboxAppFolderPath, [inboxContents objectAtIndex:i]]; + NSString *newPath = [NSString stringWithFormat:@"%@/%@", appFolderPath, [inboxContents objectAtIndex:i]]; + [[NSFileManager defaultManager] moveItemAtPath:oldPath toPath:newPath error:nil]; + } + if (self.sourceName) { #ifndef ACTIVEGS_BACKGROUNDIMAGE @@ -592,6 +612,7 @@ - (void)viewDidLoad { [super viewDidLoad]; + // IOS8 ISSUE !!!!! DefaultRawHeight = UITableViewAutomaticDimension CGFloat h = 44 * [pManager resolutionRatio]; diff --git a/Common.iphone/activegsViewController.mm b/Common.iphone/activegsViewController.mm index a697028..6f6764e 100644 --- a/Common.iphone/activegsViewController.mm +++ b/Common.iphone/activegsViewController.mm @@ -6,8 +6,8 @@ #import "activegsAppDelegate.h" #import "activegsViewController.h" -#import "activegslist.h" -#include "../Kegs/Src/sim65816.h" +#import "activegsList.h" +#include "../kegs/Src/sim65816.h" @implementation activegsViewController diff --git a/Common.iphone/activegsViewController.xib b/Common.iphone/activegsViewController.xib index 0c6953a..faff9fe 100644 --- a/Common.iphone/activegsViewController.xib +++ b/Common.iphone/activegsViewController.xib @@ -1,110 +1,31 @@ - - - 1552 - 13F34 - 6254 - 1265.21 - 698.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 6247 - - - IBProxyObject - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - {320, 460} - - 3 - MC43NQA - - 2 - - - NO - - IBUISimulatedFreeformSizeMetricsSentinel - Freeform - - IBCocoaTouchFramework - - - - - - - view - - - - 7 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 6 - - - - - - - activegsViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 7 - - - 0 - IBCocoaTouchFramework - NO - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - 3 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Common.iphone/asynccommand.mm b/Common.iphone/asynccommand.mm index 10f9ee0..a99c70b 100644 --- a/Common.iphone/asynccommand.mm +++ b/Common.iphone/asynccommand.mm @@ -5,7 +5,7 @@ */ #include "activegsAppDelegate.h" -#include "../common/CEmulatorCtrl.h" +#include "../Common/CEMulatorCtrl.h" #include "asynccommand.h" @implementation AsyncCommand diff --git a/Common.iphone/asyncimageview.mm b/Common.iphone/asyncimageview.mm index b5bc487..4dee16f 100644 --- a/Common.iphone/asyncimageview.mm +++ b/Common.iphone/asyncimageview.mm @@ -5,8 +5,8 @@ */ #include "activegsAppDelegate.h" -#import "AsyncImageView.h" -#include "../common/CEmulatorCtrl.h" +#import "asyncimageview.h" +#include "../Common/CEMulatorCtrl.h" static asyncImageQueue* queue = nil; diff --git a/Common.iphone/detailViewController.xib b/Common.iphone/detailViewController.xib index 8d56f6c..6dd8449 100644 --- a/Common.iphone/detailViewController.xib +++ b/Common.iphone/detailViewController.xib @@ -1,517 +1,111 @@ - - - 1536 - 11G63 - 2844 - 1138.51 - 569.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1930 - - - YES - IBProxyObject - IBUIButton - IBUIImageView - IBUILabel - IBUINavigationBar - IBUIView - IBUIViewController - IBUIWebView - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 287 - - YES - - - 269 - {{119, 435}, {78, 37}} - - NO - IBCocoaTouchFramework - 0 - 0 - 1 - Launch - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - Helvetica-Bold - Helvetica - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - - 293 - {{129, 53}, {62, 25}} - - NO - YES - 4 - YES - IBCocoaTouchFramework - - NSImage - icon_APPLE 2GS.png - - - - - 293 - {{130, 55}, {60, 21}} - - NO - YES - 4 - YES - IBCocoaTouchFramework - - NSImage - icon_APPLE 2.png - - - - - 292 - {{8, 53}, {114, 21}} - - NO - YES - 7 - NO - IBCocoaTouchFramework - Company - - 1 - MCAwIDAAA - darkTextColor - - - 1 - 10 - - Helvetica - Helvetica - 0 - 12 - - - Helvetica - 12 - 16 - - - - - 289 - {{238, 53}, {73, 21}} - - NO - YES - 7 - NO - IBCocoaTouchFramework - 1988 - - - 1 - 10 - 2 - - - - - - 274 - {{8, 84}, {303, 278}} - - - 1 - MSAxIDEAA - - IBCocoaTouchFramework - 2 - - - - 268 - {{8, 370}, {91, 57}} - - NO - IBCocoaTouchFramework - - - - 269 - {{114, 370}, {91, 57}} - - NO - IBCocoaTouchFramework - - - - 265 - {{220, 370}, {91, 57}} - - NO - IBCocoaTouchFramework - - - - 290 - {320, 44} - - NO - IBCocoaTouchFramework - 1 - - YES - - - - {320, 480} - - - 3 - MQA - - 2 - - - IBCocoaTouchFramework - - - detailViewController - - - 1 - 1 - - IBCocoaTouchFramework - NO - - - - - YES - - - view - - - - 6 - - - - diskApple2GS - - - - 13 - - - - diskApple2 - - - - 14 - - - - diskCompany - - - - 19 - - - - diskYear - - - - 20 - - - - diskWebView - - - - 28 - - - - screenShot1 - - - - 32 - - - - screenShot2 - - - - 33 - - - - screenShot3 - - - - 34 - - - - navView - - - - 67 - - - - launchButton: - - - 7 - - 9 - - - - delegate - - - - 27 - - - - - YES - - 0 - - - - - - 1 - - - YES - - - - - - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 8 - - - - - 10 - - - - - 11 - - - - - 15 - - - - - 16 - - - - - 24 - - - - - 26 - - - - - 29 - - - - - 30 - - - - - 31 - - - - - 54 - - - YES - - - - - - - YES - - YES - -1.CustomClassName - -1.IBPluginDependency - -2.CustomClassName - -2.IBPluginDependency - 1.IBPluginDependency - 10.IBPluginDependency - 11.IBPluginDependency - 15.IBPluginDependency - 16.IBPluginDependency - 24.CustomClassName - 24.IBPluginDependency - 26.IBPluginDependency - 29.IBPluginDependency - 30.IBPluginDependency - 31.IBPluginDependency - 54.IBPluginDependency - 8.IBPluginDependency - - - YES - detailViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - detailViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - YES - - - - - - YES - - - - - 67 - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - icon_APPLE 2.png - icon_APPLE 2GS.png - - - YES - {62, 23} - {62, 25} - - - 1930 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Common.osx/ActiveDownloadMac.cpp b/Common.osx/ActiveDownloadMac.cpp index 76c0ad8..62e8afc 100644 --- a/Common.osx/ActiveDownloadMac.cpp +++ b/Common.osx/ActiveDownloadMac.cpp @@ -4,11 +4,11 @@ This code is covered by the GNU GPL licence */ -#include "../common.osx/cemulatorctrlmac.h" -#include "activedownload.h" +#include "../Common.osx/cemulatorctrlmac.h" +#include "ActiveDownload.h" #include #include -#include "../common/ki.h" +#include "../Common/ki.h" #include "../kegs/Src/sim65816.h" #ifdef DRIVER_IOS @@ -351,4 +351,4 @@ void x_init_persistent_path(MyString& hp) hp = CFStringGetCStringPtr(fullpath,CFStringGetSystemEncoding()); } -#endif \ No newline at end of file +#endif diff --git a/Common.osx/CEmulatorCtrlMac.cpp b/Common.osx/CEmulatorCtrlMac.cpp index ca6ecc0..6136999 100644 --- a/Common.osx/CEmulatorCtrlMac.cpp +++ b/Common.osx/CEmulatorCtrlMac.cpp @@ -4,8 +4,8 @@ This code is covered by the GNU GPL licence */ -#include "../common.osx/CEmulatorCtrlMac.h" -#include "../common/svnversion.h" +#include "../Common.osx/cemulatorctrlmac.h" +#include "../Common/svnversion.h" #include #include "../kegs/Src/sim65816.h" #include diff --git a/Common.osx/CEmulatorCtrlMac.h b/Common.osx/CEmulatorCtrlMac.h index aefff3e..3de69a2 100644 --- a/Common.osx/CEmulatorCtrlMac.h +++ b/Common.osx/CEmulatorCtrlMac.h @@ -18,7 +18,7 @@ #endif #endif -#include "../Common/CEmulatorCtrl.h" +#include "../Common/CEMulatorCtrl.h" #ifdef DRIVER_IOS @@ -67,4 +67,4 @@ class CEmulatorMac : public CEmulator virtual void loadingInProgress(int _motorOn,int _slot, int _drive); virtual void showStatus(const char* _msg) ; ~CEmulatorMac(); -}; \ No newline at end of file +}; diff --git a/Common/3rdpartylib/simplexml.cpp b/Common/3rdpartylib/simplexml.cpp index 354462a..dfa0a3d 100644 --- a/Common/3rdpartylib/simplexml.cpp +++ b/Common/3rdpartylib/simplexml.cpp @@ -24,7 +24,7 @@ #include #include "simplexml.h" -#include "../cemulatorctrl.h" +#include "../CEMulatorCtrl.h" #undef debug_printf diff --git a/Common/ActiveDownload.cpp b/Common/ActiveDownload.cpp index 630e631..d5bad46 100644 --- a/Common/ActiveDownload.cpp +++ b/Common/ActiveDownload.cpp @@ -1,10 +1,10 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - -#include "activedownload.h" +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + +#include "ActiveDownload.h" //#include #include "ki.h" diff --git a/Common/ActiveGSList.cpp b/Common/ActiveGSList.cpp index 8f71c31..9326b54 100644 --- a/Common/ActiveGSList.cpp +++ b/Common/ActiveGSList.cpp @@ -5,7 +5,7 @@ */ #include "ActiveGSList.h" -#include "activedownload.h" +#include "ActiveDownload.h" ActiveGSList::~ActiveGSList() { diff --git a/Common/ActiveGSList.h b/Common/ActiveGSList.h index 21e2ba1..545c87b 100644 --- a/Common/ActiveGSList.h +++ b/Common/ActiveGSList.h @@ -1,17 +1,17 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #pragma once #include #define MAX_SCREENSHOTS 10 -#include "../common/3rdpartylib/simplexml.h" -#include "../kegs/src/StdString.h" -#include "../kegs/src/defc.h" -#include "../common/ki.h" +#include "../Common/3rdpartylib/simplexml.h" +#include "../kegs/Src/StdString.h" +#include "../kegs/Src/defc.h" +#include "../Common/ki.h" diff --git a/Common/ActiveZip.cpp b/Common/ActiveZip.cpp index 0d271b1..011f4ff 100644 --- a/Common/ActiveZip.cpp +++ b/Common/ActiveZip.cpp @@ -4,7 +4,7 @@ This code is covered by the GNU GPL licence */ -#include "cemulatorctrl.h" +#include "CEMulatorCtrl.h" #include "ki.h" #include "../Libraries/unzip101e/unzip.h" diff --git a/Common/CA2Text.cpp b/Common/CA2Text.cpp index 3bb5c20..964742f 100644 --- a/Common/CA2Text.cpp +++ b/Common/CA2Text.cpp @@ -4,8 +4,8 @@ This code is covered by the GNU GPL licence */ -#include "../common/cemulatorctrl.h" -#include "../kegs/src/sim65816.h" +#include "../Common/CEMulatorCtrl.h" +#include "../kegs/Src/sim65816.h" extern word32 g_font40_even_bits[0x100][8][16/4]; extern word32 g_font40_odd_bits[0x100][8][16/4]; @@ -116,4 +116,4 @@ void drawText(Kimage* _dst, const char* text,int _x,int _y) } ptrline += 8*pixsize; } -} \ No newline at end of file +} diff --git a/Common/CEMulatorCtrl.h b/Common/CEMulatorCtrl.h index 69a19c7..89c9fc0 100644 --- a/Common/CEMulatorCtrl.h +++ b/Common/CEMulatorCtrl.h @@ -1,9 +1,9 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #pragma once //#ifndef MAC @@ -11,11 +11,11 @@ #include #endif -#include "../common/ActiveGSList.h" -#include "../common/activedownload.h" -#include "../common/ki.h" +#include "../Common/ActiveGSList.h" +#include "../Common/ActiveDownload.h" +#include "../Common/ki.h" -#include "../kegs/src/sound.h" +#include "../kegs/Src/sound.h" extern int outputInfoInternal(const char*); diff --git a/Common/CEmulatorCtrl.cpp b/Common/CEmulatorCtrl.cpp index ce064ab..2287db6 100644 --- a/Common/CEmulatorCtrl.cpp +++ b/Common/CEmulatorCtrl.cpp @@ -1,24 +1,24 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - -#include "cemulatorctrl.h" +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + +#include "CEMulatorCtrl.h" #include "svnversion.h" -#include "../kegs/src/adb.h" -#include "../kegs/src/clock.h" -#include "../kegs/src/moremem.h" -#include "../kegs/src/paddles.h" -#include "../kegs/src/sim65816.h" -#include "../kegs/src/iwm.h" -#include "../kegs/src/SaveState.h" -#include "../kegs/src/raster.h" -#include "../kegs/src/graphcounter.h" -#include "../kegs/src/driver.h" -#include "../kegs/src/video.h" -#include "../kegs/src/async_event.h" +#include "../kegs/Src/adb.h" +#include "../kegs/Src/clock.h" +#include "../kegs/Src/moremem.h" +#include "../kegs/Src/paddles.h" +#include "../kegs/Src/sim65816.h" +#include "../kegs/Src/iwm.h" +#include "../kegs/Src/SaveState.h" +#include "../kegs/Src/raster.h" +#include "../kegs/Src/graphcounter.h" +#include "../kegs/Src/driver.h" +#include "../kegs/Src/video.h" +#include "../kegs/Src/async_event.h" extern void joystick_shut(); #define CONFIG_VERSION 3 @@ -1139,8 +1139,9 @@ void CEmulatorConfig::loadXMLFile() void CEmulator::sendStats() { +/* #pragma message("TODO refaire les stats!") - /* + #ifndef DRIVER_IOS MyString str="http://analytics.freetoolsassociation.com/analytics.php?"; const char* app =ACTIVEGSAPP ; diff --git a/Common/activeconfig.cpp b/Common/activeconfig.cpp index a62f803..d8e0292 100644 --- a/Common/activeconfig.cpp +++ b/Common/activeconfig.cpp @@ -4,10 +4,10 @@ This code is covered by the GNU GPL licence */ -#include "Cemulatorctrl.h" +#include "CEMulatorCtrl.h" #include "../kegs/Src/iwm.h" #include "../kegs/Src/config.h" -#include "../kegs/Src/savestate.h" +#include "../kegs/Src/SaveState.h" void x_notify_disk_insertion(int _size,int _start, int _isprodos,int slot, int drive) { diff --git a/Common/interface.cpp b/Common/interface.cpp index c95f688..331be8e 100644 --- a/Common/interface.cpp +++ b/Common/interface.cpp @@ -1,13 +1,13 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #include "CEMulatorCtrl.h" -#include "../kegs/src/clock.h" -#include "../kegs/src/sim65816.h" -#include "../kegs/src/driver.h" +#include "../kegs/Src/clock.h" +#include "../kegs/Src/sim65816.h" +#include "../kegs/Src/driver.h" extern void addConsole(const char*); diff --git a/Common/ki.h b/Common/ki.h index 355c740..3fe8613 100644 --- a/Common/ki.h +++ b/Common/ki.h @@ -1,9 +1,9 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #ifndef KEGS_KI_H #define KEGS_KI_H @@ -12,8 +12,8 @@ #include #endif -#include "../kegs/src/defc.h" -#include "../kegs/src/iwm.h" +#include "../kegs/Src/defc.h" +#include "../kegs/Src/iwm.h" extern void showStatus(const char* format,...); extern void showError(const char* format,...); extern void showProgress(const char* file,int percent); diff --git a/Common/libpng.cpp b/Common/libpng.cpp index 7ba7f36..5bd6558 100644 --- a/Common/libpng.cpp +++ b/Common/libpng.cpp @@ -1,12 +1,12 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #include "../Libraries/libpng/png.h" -#include "cemulatorctrl.h" -#include "../kegs/src/video.h" +#include "CEMulatorCtrl.h" +#include "../kegs/Src/video.h" #define abort_(X) { printf(X); return 0;} extern word32 g_a2palette_8to1624[256]; diff --git a/Common/rom.cpp b/Common/rom.cpp index 1e503a7..3c923c3 100644 --- a/Common/rom.cpp +++ b/Common/rom.cpp @@ -1,11 +1,11 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #include "../Common/CEMulatorCtrl.h" -#include "../Kegs/Src/sim65816.h" +#include "../kegs/Src/sim65816.h" void default_config_load_roms() { diff --git a/Drivers/activegs_driver.cpp b/Drivers/activegs_driver.cpp index 81e0a5e..8524883 100644 --- a/Drivers/activegs_driver.cpp +++ b/Drivers/activegs_driver.cpp @@ -1,10 +1,10 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - -#include "../kegs/src/driver.h" +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + +#include "../kegs/Src/driver.h" extern void default_config_load_roms(); void activegs_driver() diff --git a/Libraries/unzip101e/zip.cpp b/Libraries/unzip101e/zip.cpp index 5941e65..475c03b 100644 --- a/Libraries/unzip101e/zip.cpp +++ b/Libraries/unzip101e/zip.cpp @@ -79,9 +79,12 @@ # define DEF_MEM_LEVEL MAX_MEM_LEVEL #endif #endif +/* const char zip_copyright[] = " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll"; + */ +/* Not used on ActiveGS, so cleaned for crunching ... */ #define SIZEDATA_INDATABLOCK (4096-(4*4)) diff --git a/Libraries/zlib123/deflate.cpp b/Libraries/zlib123/deflate.cpp index 0ae03ea..0673fb1 100644 --- a/Libraries/zlib123/deflate.cpp +++ b/Libraries/zlib123/deflate.cpp @@ -49,6 +49,7 @@ /* @(#) $Id$ */ + #include "deflate.h" const char deflate_copyright[] = diff --git a/kegs/OSX/macdriver_activegs.cpp b/kegs/OSX/macdriver_activegs.cpp index 9dc5564..4145ab1 100644 --- a/kegs/OSX/macdriver_activegs.cpp +++ b/kegs/OSX/macdriver_activegs.cpp @@ -8,13 +8,13 @@ #error "missing DRIVER_IOS or DRIVER_OSX" #endif -#include "../src/defc.h" -#include "../src/protos_macdriver.h" -#include "../src/sim65816.h" +#include "../Src/defc.h" +#include "../Src/protos_macdriver.h" +#include "../Src/sim65816.h" #include -#include "../src/video.h" -#include "../src/graphcounter.h" -#include "../src/async_event.h" +#include "../Src/video.h" +#include "../Src/graphcounter.h" +#include "../Src/async_event.h" #include "../Src/StdString.h" #include "../Src/driver.h" diff --git a/kegs/OSX/macdriver_generic.cpp b/kegs/OSX/macdriver_generic.cpp index 92442a6..8522f05 100644 --- a/kegs/OSX/macdriver_generic.cpp +++ b/kegs/OSX/macdriver_generic.cpp @@ -28,12 +28,12 @@ #include -#include "../src/defc.h" -#include "../src/protos_macdriver.h" -#include "../src/video.h" -#include "../src/raster.h" -#include "../src/sound.h" -#include "../src/StdString.h" +#include "../Src/defc.h" +#include "../Src/protos_macdriver.h" +#include "../Src/video.h" +#include "../Src/raster.h" +#include "../Src/sound.h" +#include "../Src/StdString.h" diff --git a/kegs/OSX/scc_macdriver.cpp b/kegs/OSX/scc_macdriver.cpp index 39f6993..6acbfb9 100644 --- a/kegs/OSX/scc_macdriver.cpp +++ b/kegs/OSX/scc_macdriver.cpp @@ -4,8 +4,8 @@ This code is covered by the GNU GPL licence */ -#include "../src/defc.h" -#include "../src/scc.h" +#include "../Src/defc.h" +#include "../Src/scc.h" #ifndef _WIN32 # include diff --git a/kegs/Src/GraphCounter.cpp b/kegs/Src/GraphCounter.cpp index 8b0857e..846ec78 100644 --- a/kegs/Src/GraphCounter.cpp +++ b/kegs/Src/GraphCounter.cpp @@ -1,13 +1,13 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #include "defc.h" #include "video.h" #include "sim65816.h" -#include "GraphCounter.h" +#include "graphcounter.h" #include "raster.h" #ifdef ENABLE_GRAPH diff --git a/kegs/Src/SaveState.cpp b/kegs/Src/SaveState.cpp index 4c01b63..2d1666d 100644 --- a/kegs/Src/SaveState.cpp +++ b/kegs/Src/SaveState.cpp @@ -1,15 +1,15 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #ifdef _WIN32 # define _WINSOCKAPI_ #endif #include "StdString.h" #include "defc.h" -#include "savestate.h" +#include "SaveState.h" #include "adb.h" #include "async_event.h" #include "clock.h" diff --git a/kegs/Src/async_event.cpp b/kegs/Src/async_event.cpp index 3961f23..8cc5859 100644 --- a/kegs/Src/async_event.cpp +++ b/kegs/Src/async_event.cpp @@ -1,15 +1,15 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #include #include "defc.h" #include "adb.h" #include "async_event.h" #include "sim65816.h" -#include "savestate.h" +#include "SaveState.h" extern void x_check_system_input_events(); extern void x_update_modifiers(word32); diff --git a/kegs/Src/compression.cpp b/kegs/Src/compression.cpp index b01f0ce..8cff88e 100644 --- a/kegs/Src/compression.cpp +++ b/kegs/Src/compression.cpp @@ -1,11 +1,11 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #include "defc.h" -#include "savestate.h" +#include "SaveState.h" #include "compression.h" #include "../../Libraries/zlib123/zlib.h" diff --git a/kegs/Src/openalasync_snddriver.cpp b/kegs/Src/openalasync_snddriver.cpp index 746e3a7..0cddadc 100644 --- a/kegs/Src/openalasync_snddriver.cpp +++ b/kegs/Src/openalasync_snddriver.cpp @@ -529,33 +529,38 @@ int x_is_sound_playing(enum_sound _hSound) #if 1 +#pragma push() +#pragma pack(1) /* * Struct to hold fmt subchunk data for WAVE files. */ struct WAVE_Format { char subChunkID[4]; - long subChunkSize; + int subChunkSize; short audioFormat; short numChannels; - long sampleRate; - long byteRate; + int sampleRate; + int byteRate; short blockAlign; short bitsPerSample; -}; +} __attribute__((packed)); /* * Struct to hold the data of the wave file */ struct WAVE_Data { char subChunkID[4]; //should contain the word data - long subChunk2Size; //Stores the size of the data block -}; + int subChunk2Size; //Stores the size of the data block +} __attribute__((packed)); struct RIFF_Header { char chunkID[4]; - long chunkSize;//size not including chunkSize or chunkID + int chunkSize;//size not including chunkSize or chunkID char format[4]; -}; +} __attribute__((packed)); + +#pragma pop() + bool loadWavFile(const char* filename, unsigned char** buffer, unsigned int* size, int* frequency, diff --git a/kegs/Src/sim65816.cpp b/kegs/Src/sim65816.cpp index a1ce06d..22ec8c1 100644 --- a/kegs/Src/sim65816.cpp +++ b/kegs/Src/sim65816.cpp @@ -1,9 +1,9 @@ -/* - ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS - Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net - This code is covered by the GNU GPL licence -*/ - +/* + ActiveGS, Copyright 2004-2016 Olivier Goguel, https://github.com/ogoguel/ActiveGS + Based on Kegs, Copyright 2004 Kent Dickey, https://kegs.sourceforge.net + This code is covered by the GNU GPL licence +*/ + #ifdef _WIN32 # define _WINSOCKAPI_ #endif @@ -34,7 +34,7 @@ #include "config.h" #include "sound.h" #include "video.h" -#include "saveState.h" +#include "SaveState.h" #include "graphcounter.h" #include "marinetti.h" diff --git a/kegs/iOS/joystick_iphone.cpp b/kegs/iOS/joystick_iphone.cpp index c6d506a..f0428fe 100644 --- a/kegs/iOS/joystick_iphone.cpp +++ b/kegs/iOS/joystick_iphone.cpp @@ -4,9 +4,9 @@ This code is covered by the GNU GPL licence */ -#include "../src/defc.h" -#include "../src/paddles.h" -#include "../src/moremem.h" +#include "../Src/defc.h" +#include "../Src/paddles.h" +#include "../Src/moremem.h" void diff --git a/kegs/iOS/zoomEmulatorView.mm b/kegs/iOS/zoomEmulatorView.mm index ba994a0..3f91b51 100644 --- a/kegs/iOS/zoomEmulatorView.mm +++ b/kegs/iOS/zoomEmulatorView.mm @@ -11,7 +11,7 @@ #ifdef ACTIVEGSKARATEKA #import "../../ActiveGS_Karateka/KaratekaAppDelegate.h" #elif defined(ACTIVEGS) -#import "../../common.iphone/activegsAppDelegate.h" +#import "../../Common.iphone/activegsAppDelegate.h" #endif