| OLD | NEW |
| 1 diff -urN SDL-1.2.14/build-scripts/config.sub SDL-1.2.14-nacl/build-scripts/conf
ig.sub | 1 diff -urN SDL-1.2.14/build-scripts/config.sub SDL-1.2.14-nacl/build-scripts/conf
ig.sub |
| 2 --- SDL-1.2.14/build-scripts/config.sub 2009-10-13 03:07:12.000000000 +0400 | 2 --- SDL-1.2.14/build-scripts/config.sub 2009-10-13 03:07:12.000000000 +0400 |
| 3 +++ SDL-1.2.14-nacl/build-scripts/config.sub 2012-01-16 12:16:39.460269192 +0
400 | 3 +++ SDL-1.2.14-nacl/build-scripts/config.sub 2012-01-16 12:16:39.460269192 +0
400 |
| 4 @@ -318,6 +318,14 @@ | 4 @@ -318,6 +318,14 @@ |
| 5 i*86 | x86_64) | 5 i*86 | x86_64) |
| 6 basic_machine=$basic_machine-pc | 6 basic_machine=$basic_machine-pc |
| 7 ;; | 7 ;; |
| 8 + nacl64*) | 8 + nacl64*) |
| 9 + basic_machine=x86_64-pc | 9 + basic_machine=x86_64-pc |
| 10 + os=-nacl | 10 + os=-nacl |
| (...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1164 + | 1164 + |
| 1165 + } | 1165 + } |
| 1166 +} | 1166 +} |
| 1167 + | 1167 + |
| 1168 +void SDLNaclJob::Finish(int32_t result) { | 1168 +void SDLNaclJob::Finish(int32_t result) { |
| 1169 + MainThreadRunner::ResultCompletion(job_entry_, result); | 1169 + MainThreadRunner::ResultCompletion(job_entry_, result); |
| 1170 +} | 1170 +} |
| 1171 diff -urN SDL-1.2.14/src/video/nacl/SDL_nacljob.h SDL-1.2.14-nacl/src/video/nacl
/SDL_nacljob.h | 1171 diff -urN SDL-1.2.14/src/video/nacl/SDL_nacljob.h SDL-1.2.14-nacl/src/video/nacl
/SDL_nacljob.h |
| 1172 --- SDL-1.2.14/src/video/nacl/SDL_nacljob.h 1970-01-01 03:00:00.000000000 +0
300 | 1172 --- SDL-1.2.14/src/video/nacl/SDL_nacljob.h 1970-01-01 03:00:00.000000000 +0
300 |
| 1173 +++ SDL-1.2.14-nacl/src/video/nacl/SDL_nacljob.h 2012-01-16 12:16:39.4702
69368 +0400 | 1173 +++ SDL-1.2.14-nacl/src/video/nacl/SDL_nacljob.h 2012-01-16 12:16:39.4702
69368 +0400 |
| 1174 @@ -0,0 +1,55 @@ | 1174 @@ -0,0 +1,60 @@ |
| 1175 +/* | 1175 +/* |
| 1176 + * Copyright (c) 2011 The Native Client Authors. All rights reserved. | 1176 + * Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| 1177 + * Use of this source code is governed by a BSD-style license that can be | 1177 + * Use of this source code is governed by a BSD-style license that can be |
| 1178 + * found in the LICENSE file. | 1178 + * found in the LICENSE file. |
| 1179 + */ | 1179 + */ |
| 1180 +#ifndef _SDL_nacljob_h | 1180 +#ifndef _SDL_nacljob_h |
| 1181 +#define _SDL_nacljob_h | 1181 +#define _SDL_nacljob_h |
| 1182 + | 1182 + |
| 1183 +#include <ppapi/c/pp_errors.h> | 1183 +#include <ppapi/c/pp_errors.h> |
| 1184 +#include <ppapi/c/pp_file_info.h> | 1184 +#include <ppapi/c/pp_file_info.h> |
| 1185 +#include <ppapi/cpp/completion_callback.h> | 1185 +#include <ppapi/cpp/completion_callback.h> |
| 1186 +#include <ppapi/cpp/file_io.h> | 1186 +#include <ppapi/cpp/file_io.h> |
| 1187 +#include <ppapi/cpp/file_ref.h> | 1187 +#include <ppapi/cpp/file_ref.h> |
| 1188 +#include <ppapi/cpp/file_system.h> | 1188 +#include <ppapi/cpp/file_system.h> |
| 1189 +#include <ppapi/cpp/url_loader.h> | 1189 +#include <ppapi/cpp/url_loader.h> |
| 1190 +#include <ppapi/cpp/url_request_info.h> | 1190 +#include <ppapi/cpp/url_request_info.h> |
| 1191 +#include <ppapi/cpp/url_response_info.h> | 1191 +#include <ppapi/cpp/url_response_info.h> |
| 1192 +/* TODO: include completion_callback_factory.h unconditionally one all sdk are
updated */ |
| 1193 +#include <ppapi/c/ppb_var.h> |
| 1194 +#ifdef PPB_VAR_INTERFACE_1_1 |
| 1195 +#include <ppapi/utility/completion_callback_factory.h> |
| 1196 +#endif |
| 1192 +#include <string> | 1197 +#include <string> |
| 1193 +#include <vector> | 1198 +#include <vector> |
| 1194 +#include <set> | 1199 +#include <set> |
| 1195 +#include "MainThreadRunner.h" | 1200 +#include "MainThreadRunner.h" |
| 1196 + | 1201 + |
| 1197 +#include "SDL_naclvideo.h" | 1202 +#include "SDL_naclvideo.h" |
| 1198 +extern "C" { | 1203 +extern "C" { |
| 1199 +#include "../SDL_sysvideo.h" | 1204 +#include "../SDL_sysvideo.h" |
| 1200 +} | 1205 +} |
| 1201 + | 1206 + |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1534 @@ -33,6 +33,9 @@ | 1539 @@ -33,6 +33,9 @@ |
| 1535 | 1540 |
| 1536 /* Available video drivers */ | 1541 /* Available video drivers */ |
| 1537 static VideoBootStrap *bootstrap[] = { | 1542 static VideoBootStrap *bootstrap[] = { |
| 1538 +#if SDL_VIDEO_DRIVER_NACL | 1543 +#if SDL_VIDEO_DRIVER_NACL |
| 1539 + &NACL_bootstrap, | 1544 + &NACL_bootstrap, |
| 1540 +#endif | 1545 +#endif |
| 1541 #if SDL_VIDEO_DRIVER_QUARTZ | 1546 #if SDL_VIDEO_DRIVER_QUARTZ |
| 1542 &QZ_bootstrap, | 1547 &QZ_bootstrap, |
| 1543 #endif | 1548 #endif |
| OLD | NEW |