diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 22:01:06 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 22:01:06 +0000 |
| commit | c913db88dee9d58b5f7ee1561925b52dd03d8e8e (patch) | |
| tree | 6d760ee6514dc8c8b4f71c52e6421f22440afac5 /native_client_sdk/src/examples | |
| parent | 0c181fac46ec5222829e30f680b20a92c2217f1e (diff) | |
| download | chromium_src-c913db88dee9d58b5f7ee1561925b52dd03d8e8e.zip chromium_src-c913db88dee9d58b5f7ee1561925b52dd03d8e8e.tar.gz chromium_src-c913db88dee9d58b5f7ee1561925b52dd03d8e8e.tar.bz2 | |
[NaCl SDK] Seperate LIBS and DEPS in .dsc files.
Previously anything in DEPS was implicitly added to LIBS.
This makes precise ordering of LIBS difficult. Now we can
have DEPS that are not necessarily included in LIBS.
Also, explicitly exclude ppapi_simple when in SEL_LDR
builds. Right now this feature is a hard-coded into
parse_dsc. This change is required before I can commit
the change to ppapi_simple to allow the use of the 'main'
entry point: https://codereview.chromium.org/16626007/
R=binji@chromium.org, noelallen@chromium.org
Review URL: https://codereview.chromium.org/23902043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/examples')
8 files changed, 12 insertions, 7 deletions
diff --git a/native_client_sdk/src/examples/demo/flock/example.dsc b/native_client_sdk/src/examples/demo/flock/example.dsc index 50fdeeb..e32cb06 100644 --- a/native_client_sdk/src/examples/demo/flock/example.dsc +++ b/native_client_sdk/src/examples/demo/flock/example.dsc @@ -13,7 +13,7 @@ 'vector2.h' ], 'DEPS': ['ppapi_simple', 'nacl_io'], - 'LIBS': ['ppapi_cpp', 'ppapi', 'pthread'] + 'LIBS': ['ppapi_simple', 'nacl_io', 'ppapi_cpp', 'ppapi', 'pthread'] } ], 'DATA': [ diff --git a/native_client_sdk/src/examples/demo/life/example.dsc b/native_client_sdk/src/examples/demo/life/example.dsc index 215cfa8..660df66 100644 --- a/native_client_sdk/src/examples/demo/life/example.dsc +++ b/native_client_sdk/src/examples/demo/life/example.dsc @@ -8,7 +8,7 @@ 'life.c', ], 'DEPS': ['ppapi_simple', 'nacl_io'], - 'LIBS': ['ppapi_cpp', 'ppapi', 'pthread'] + 'LIBS': ['ppapi_simple', 'nacl_io', 'ppapi_cpp', 'ppapi', 'pthread'] } ], 'DEST': 'examples/demo', diff --git a/native_client_sdk/src/examples/demo/nacl_io/example.dsc b/native_client_sdk/src/examples/demo/nacl_io/example.dsc index 65bb304..1c85cc2 100644 --- a/native_client_sdk/src/examples/demo/nacl_io/example.dsc +++ b/native_client_sdk/src/examples/demo/nacl_io/example.dsc @@ -13,7 +13,7 @@ 'queue.h', ], 'DEPS': ['nacl_io'], - 'LIBS': ['ppapi', 'pthread'] + 'LIBS': ['nacl_io', 'ppapi', 'pthread'] } ], 'DATA': [ diff --git a/native_client_sdk/src/examples/demo/pi_generator/example.dsc b/native_client_sdk/src/examples/demo/pi_generator/example.dsc index 09a53d5..5dcbe7c 100644 --- a/native_client_sdk/src/examples/demo/pi_generator/example.dsc +++ b/native_client_sdk/src/examples/demo/pi_generator/example.dsc @@ -6,7 +6,7 @@ 'TYPE' : 'main', 'SOURCES' : ['pi_generator.cc'], 'DEPS': ['ppapi_simple', 'nacl_io', 'ppapi_cpp'], - 'LIBS': ['ppapi', 'pthread'] + 'LIBS': ['ppapi_simple', 'nacl_io', 'ppapi_cpp', 'ppapi', 'pthread'] } ], 'DATA': [ diff --git a/native_client_sdk/src/examples/tutorial/debugging/example.dsc b/native_client_sdk/src/examples/tutorial/debugging/example.dsc index f7e20ead..480234f 100644 --- a/native_client_sdk/src/examples/tutorial/debugging/example.dsc +++ b/native_client_sdk/src/examples/tutorial/debugging/example.dsc @@ -10,7 +10,7 @@ ], 'CFLAGS': ['-fno-omit-frame-pointer'], 'DEPS' : ['error_handling'], - 'LIBS' : ['ppapi', 'pthread'] + 'LIBS' : ['error_handling', 'ppapi', 'pthread'] } ], 'DATA': [ diff --git a/native_client_sdk/src/examples/tutorial/dlopen/example.dsc b/native_client_sdk/src/examples/tutorial/dlopen/example.dsc index 8a1f104..47d6c89 100644 --- a/native_client_sdk/src/examples/tutorial/dlopen/example.dsc +++ b/native_client_sdk/src/examples/tutorial/dlopen/example.dsc @@ -6,7 +6,7 @@ 'TYPE': 'main', 'SOURCES': ['dlopen.cc'], 'DEPS': ['nacl_io', 'ppapi_cpp'], - 'LIBS': ['dl', 'ppapi', 'pthread'] + 'LIBS': ['nacl_io', 'ppapi_cpp', 'ppapi', 'dl', 'pthread'] }, { 'NAME' : 'eightball', diff --git a/native_client_sdk/src/examples/tutorial/using_ppapi_simple/example.dsc b/native_client_sdk/src/examples/tutorial/using_ppapi_simple/example.dsc index 9acec7c..17b1c94 100644 --- a/native_client_sdk/src/examples/tutorial/using_ppapi_simple/example.dsc +++ b/native_client_sdk/src/examples/tutorial/using_ppapi_simple/example.dsc @@ -7,7 +7,7 @@ 'TYPE' : 'main', 'SOURCES' : ['hello_world.c'], 'DEPS': ['ppapi_simple', 'nacl_io', 'ppapi_cpp'], - 'LIBS': ['ppapi', 'pthread'] + 'LIBS': ['ppapi_simple', 'nacl_io', 'ppapi_cpp', 'ppapi', 'pthread'] } ], 'DATA': [ diff --git a/native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c b/native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c index 9c98d6c..10322d0 100644 --- a/native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c +++ b/native_client_sdk/src/examples/tutorial/using_ppapi_simple/hello_world.c @@ -24,5 +24,10 @@ int example_main(int argc, char* argv[]) { /* * Register the function to call once the Instance Object is initialized. * see: pappi_simple/ps_main.h + * + * This is not needed when building the sel_ldr version of this example + * which does not link against ppapi_simple. */ +#ifndef SEL_LDR PPAPI_SIMPLE_REGISTER_MAIN(example_main) +#endif |