| |
|
File Q-host-cocoa.diff, 2.3 kB
(added by andreasf, 1 year ago)
|
patch: update q_host-cocoa_02.diff
|
-
patches/q_host-cocoa_02.diff
| old |
new |
|
| 1 | | --- Makefile.target 2007-01-31 13:24:18.000000000 +0100 |
|---|
| 2 | | +++ Makefile.target 2007-02-02 14:45:02.000000000 +0100 |
|---|
| 3 | | @@ -415,8 +419,8 @@ |
|---|
| | 1 | Index: Makefile.target |
|---|
| | 2 | =================================================================== |
|---|
| | 3 | RCS file: /sources/qemu/qemu/Makefile.target,v |
|---|
| | 4 | retrieving revision 1.238 |
|---|
| | 5 | diff -u -r1.238 Makefile.target |
|---|
| | 6 | --- Makefile.target 6 Jan 2008 18:27:58 -0000 1.238 |
|---|
| | 7 | +++ Makefile.target 8 Jan 2008 15:42:39 -0000 |
|---|
| | 8 | @@ -516,7 +516,7 @@ |
|---|
| | 9 | VL_OBJS+=gdbstub.o |
|---|
| 4 | 10 | endif |
|---|
| 5 | | VL_OBJS+=vnc.o |
|---|
| 6 | 11 | ifdef CONFIG_COCOA |
|---|
| 7 | | -VL_OBJS+=cocoa.o |
|---|
| 8 | 12 | -COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit |
|---|
| 9 | | +VL_OBJS+=cocoaQemuMain.o cocoaQemuController.o cocoaQemu.o cocoaQemuProgressWindow.o cocoaQemuWindow.o cocoaQemuOpenGLView.o cocoaQemuQuartzView.o cocoaQemuQuickDrawView.o cocoaPopUpView.o cocoaCpuView.o FSController.o FSRoundedView.o FSToolbarController.o FSTransparentButton.o |
|---|
| 10 | 13 | +COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit -framework CoreFoundation -framework OpenGL -framework ApplicationServices |
|---|
| 11 | 14 | ifdef CONFIG_COREAUDIO |
|---|
| 12 | 15 | COCOA_LIBS+=-framework CoreAudio |
|---|
| 13 | 16 | endif |
|---|
| 14 | | @@ -465,7 +469,11 @@ |
|---|
| 15 | | $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a |
|---|
| 16 | | $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) |
|---|
| | 17 | Index: Makefile |
|---|
| | 18 | =================================================================== |
|---|
| | 19 | RCS file: /sources/qemu/qemu/Makefile,v |
|---|
| | 20 | retrieving revision 1.140 |
|---|
| | 21 | diff -u -r1.140 Makefile |
|---|
| | 22 | --- Makefile 6 Jan 2008 18:27:12 -0000 1.140 |
|---|
| | 23 | +++ Makefile 8 Jan 2008 15:42:40 -0000 |
|---|
| | 24 | @@ -93,7 +93,7 @@ |
|---|
| | 25 | OBJS+=vnc.o d3des.o |
|---|
| 17 | 26 | |
|---|
| | 27 | ifdef CONFIG_COCOA |
|---|
| | 28 | -OBJS+=cocoa.o |
|---|
| | 29 | +OBJS+=cocoaQemuMain.o cocoaQemuController.o cocoaQemu.o cocoaQemuProgressWindow.o cocoaQemuWindow.o cocoaQemuOpenGLView.o cocoaQemuQuartzView.o cocoaQemuQuickDrawView.o cocoaPopUpView.o cocoaCpuView.o FSController.o FSRoundedView.o FSToolbarController.o FSTransparentButton.o |
|---|
| | 30 | endif |
|---|
| | 31 | |
|---|
| | 32 | ifdef CONFIG_SLIRP |
|---|
| | 33 | @@ -104,7 +104,10 @@ |
|---|
| | 34 | OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) |
|---|
| | 35 | endif |
|---|
| | 36 | |
|---|
| 18 | 37 | -cocoa.o: cocoa.m |
|---|
| 19 | | + |
|---|
| 20 | 38 | +cocoa%.o: host-cocoa/cocoa%.m |
|---|
| 21 | 39 | + $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $< |
|---|
| 22 | 40 | + |
|---|
Download in other formats: | |
