diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-18 08:21:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-18 08:21:05 +0200 |
| commit | d7ddd6ead83965a10d450a580a9b6042c7b86f38 (patch) | |
| tree | 9ca8c23b6aa54418990c4d851e8da97c577636a7 /mesalib/src/mesa/drivers | |
| parent | c72f683c50e774b21967f0121245a286539fa555 (diff) | |
| parent | 52213f2cd11c6cc7210cea6896ed464fddfe3fec (diff) | |
| download | vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.tar.gz vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.tar.bz2 vcxsrv-d7ddd6ead83965a10d450a580a9b6042c7b86f38.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/drivers')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/Makefile.am | 8 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/dri_test.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/Makefile.am b/mesalib/src/mesa/drivers/dri/common/Makefile.am index d81bc0e3f..6e9d738fa 100644 --- a/mesalib/src/mesa/drivers/dri/common/Makefile.am +++ b/mesalib/src/mesa/drivers/dri/common/Makefile.am @@ -28,11 +28,17 @@ AM_CFLAGS = \ $(API_DEFINES) \ $(LIBDRM_CFLAGS) -noinst_LTLIBRARIES = libdricommon.la +noinst_LTLIBRARIES = \ + libdricommon.la \ + libdri_test_stubs.la libdricommon_la_SOURCES = \ utils.c \ dri_util.c \ xmlconfig.c +libdri_test_stubs_la_SOURCES = \ + dri_test.c +libdri_test_stubs_la_CFLAGS = $(AM_CFLAGS) -DNO_MAIN + sysconf_DATA = drirc diff --git a/mesalib/src/mesa/drivers/dri/common/dri_test.c b/mesalib/src/mesa/drivers/dri/common/dri_test.c index 793f0c37d..35732857d 100644 --- a/mesalib/src/mesa/drivers/dri/common/dri_test.c +++ b/mesalib/src/mesa/drivers/dri/common/dri_test.c @@ -82,8 +82,10 @@ _glthread_GetID(void) return 0; } +#ifndef NO_MAIN int main(int argc, char** argv) { void* p = __driDriverExtensions; return (int)(unsigned long)p; } +#endif |