-Fixed a few bugs in Viewport

-Made a few demos using Viewport to show it's true power!
-Fixed some start-up error messages.

4 files changed, 21 insertions, 9 deletions

diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm
index 93b956398..56cb73ba7 100644
--- a/platform/iphone/app_delegate.mm
+++ b/platform/iphone/app_delegate.mm
@@ -33,7 +33,7 @@
 #include "core/globals.h"
 #include "main/main.h"
 
-#ifdef FACEBOOK_ENABLED
+#ifdef MODULE_FACEBOOKSCORER_IOS_ENABLED
 #include "modules/FacebookScorer_ios/FacebookScorer.h"
 #endif
 
@@ -250,7 +250,7 @@ static int frame_count = 0;
 }
 
 - (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url {
-#ifdef FACEBOOK_ENABLED
+#ifdef MODULE_FACEBOOKSCORER_IOS_ENABLED
 	return [[[FacebookScorer sharedInstance] facebook] handleOpenURL:url];
 #else
 	return false;
@@ -259,7 +259,7 @@ static int frame_count = 0;
 
 // For 4.2+ support
 - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
-#ifdef FACEBOOK_ENABLED
+#ifdef MODULE_FACEBOOKSCORER_IOS_ENABLED
 	return [[[FacebookScorer sharedInstance] facebook] handleOpenURL:url];
 #else
 	return false;
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index 4b95ef2be..566249099 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -81,7 +81,7 @@ def configure(env):
 							'-framework', 'AudioToolbox',
 							'-framework', 'SystemConfiguration',
 							'-framework', 'Security',
-							#'-framework', 'AdSupport',
+							'-framework', 'AdSupport',
 							'-framework', 'MediaPlayer',
 							])
 
diff --git a/platform/iphone/in_app_store.mm b/platform/iphone/in_app_store.mm
index 71e95666a..9b932d147 100644
--- a/platform/iphone/in_app_store.mm
+++ b/platform/iphone/in_app_store.mm
@@ -168,6 +168,9 @@ Error InAppStore::request_product_info(Variant p_params) {
 			ret["result"] = "ok";
 			ret["product_id"] = pid;
             
+            NSData* receipt = nil;
+            int sdk_version = 6;
+            
             if([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0){
                 
                 NSURL *receiptFileURL = nil;
@@ -178,19 +181,30 @@ Error InAppStore::request_product_info(Variant p_params) {
                     receiptFileURL = [bundle appStoreReceiptURL];
                     
                     // Read in the contents of the transaction file.
-                    ret["receipt"] = receiptFileURL;
+                    receipt = [NSData dataWithContentsOfURL:receiptFileURL];
+                    sdk_version = 7;
                     
                 } else {
                     // Fall back to deprecated transaction receipt,
                     // which is still available in iOS 7.
                     
                     // Use SKPaymentTransaction's transactionReceipt.
-                    ret["receipt"] = transaction.transactionReceipt;
+                    receipt = transaction.transactionReceipt;
                 }
                 
             }else{
-                ret["receipt"] = transaction.transactionReceipt;
+                receipt = transaction.transactionReceipt;
+            }
+            
+            NSString* receipt_to_send = nil;
+            if (receipt != nil)
+            {
+                receipt_to_send = [receipt description];
             }
+            Dictionary receipt_ret;
+            receipt_ret["receipt"] = String::utf8([receipt_to_send UTF8String]);
+            receipt_ret["sdk"] = sdk_version;
+            ret["receipt"] = receipt_ret;
             
 			InAppStore::get_singleton()->_post_event(ret);
 			[[SKPaymentQueue defaultQueue] finishTransaction:transaction];
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index a09575bad..ff34d8eb2 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -1227,8 +1227,6 @@ void OS_X11::set_icon(const Image& p_icon) {
 
 		pd.resize(2+w*h);
 
-		print_line("***** SET ICON ***** "+itos(w)+"  "+itos(h));
-
 		pd[0]=w;
 		pd[1]=h;