Permalink
Browse files

Merge branch 'master' of git@github.com:comex/frash

  • Loading branch information...
2 parents eacc9e8 + fa16c10 commit 42825e4c36fa018ff1c958ab666a87a248a189c6 Mobile User committed Jul 10, 2010
Showing with 7 additions and 10 deletions.
  1. +2 −7 Player2/Classes/PluginFlashView.m
  2. +1 −1 env.mk
  3. +1 −0 food/Makefile
  4. +0 −1 food/anp.cpp
  5. +3 −1 rpc/Makefile
@@ -15,6 +15,7 @@ @interface NSObject (FakeMethodsToMakeGCCShutUp)
- (id)webFrame;
- (id)windowObject;
- (WebFrame *)findFrameNamed:(NSString *)name;
+- (void)webPlugInContainerLoadRequest:(NSURLRequest *)request inFrame:(NSString *)target;
@end
@@ -261,13 +262,7 @@ - (void)func:(NSSet *)touches withEvent:(UIEvent *)event { \
foo(touchesCancelled, kCancel_ANPTouchAction)
- (void)goToURL:(NSURL *)URL inFrame:(NSString *)frameName {
- WebFrame *myframe = [[arguments objectForKey:@"WebPlugInContainerKey"] webFrame];
- WebFrame *frame = [myframe findFrameNamed:frameName];
- if(!frame) {
- // It really should open a new window
- frame = myframe;
- }
- [frame loadRequest:[NSURLRequest requestWithURL:URL]];
+ [[arguments objectForKey:@"WebPlugInContainerKey"] webPlugInContainerLoadRequest: [NSURLRequest requestWithURL:URL] inFrame: frameName];
}
- (UIImage *)scaleImage:(UIImage *) image maxWidth:(float) maxWidth maxHeight:(float) maxHeight
View
2 env.mk
@@ -5,7 +5,7 @@ XSTUFF := --sysroot $(SDK) -F$(SDK)/System/Library/Frameworks -F$(SDK)/System/Li
GCC := gcc $(XSTUFF)
GXX := g++ $(XSTUFF)
else
-SDK := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhone3.2.sdk/
+SDK := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS3.2.sdk/
GCC := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 --sysroot $(SDK) -arch armv7
GXX := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-4.2 --sysroot $(SDK) -arch armv7
endif
View
@@ -39,6 +39,7 @@ food: ../rpc/food_rpc1.h $(OBJS)
food_wrapper: food_wrapper.c
$(GCC) $(STUFF) -o food_wrapper food_wrapper.c
+ ldid -S food_wrapper
clean:
rm -f *.o fixups/*.o food
View
@@ -624,7 +624,6 @@ void window_impl_clearVisibleRects(NPP instance) {
*/
void window_impl_showKeyboard(NPP instance, bool value) {
notice("%s", __func__);
- _abort();
}
/** Called when a plugin wishes to enter into full screen mode. The plugin's
Java class (set using kSetPluginStubJavaClassName_ANPSetValue) will be
View
@@ -1,6 +1,8 @@
+include ../env.mk
+
all:
python PROTOCOLBUFFERS.py food.proto
- gcc -O2 -g3 --sysroot /var/sdk -Dstream_t=int -c food_rpc[12].c
+ $(GCC) -O2 -g3 --sysroot $(SDK) -Dstream_t=int -c food_rpc[12].c
cp food_rpc2.h food_rpc2.c ../Player2/
clean:
rm *.[cho]

0 comments on commit 42825e4

Please sign in to comment.