diff options
Diffstat (limited to 'src/mapi/vgapi')
| -rw-r--r-- | src/mapi/vgapi/Makefile | 5 | ||||
| -rw-r--r-- | src/mapi/vgapi/SConscript | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/src/mapi/vgapi/Makefile b/src/mapi/vgapi/Makefile index e239e20987..68cf26e83c 100644 --- a/src/mapi/vgapi/Makefile +++ b/src/mapi/vgapi/Makefile @@ -81,11 +81,14 @@ install: default install-headers install-pc $(MINSTALL) $(TOP)/$(LIB_DIR)/$(VG_LIB_GLOB) \ $(DESTDIR)$(INSTALL_LIB_DIR) +# due to a bug in makedepend, cannot pass VGAPI_CPPFLAGS to it +$(VGAPI_OBJECTS): vgapi_tmp.h + depend: $(VGAPI_SOURCES) @echo "running $(MKDEP)" @touch depend @$(MKDEP) $(MKDEP_OPTIONS) -f- $(DEFINES) $(INCLUDE_DIRS) \ - $(VGAPI_CPPFLAGS) $(VGAPI_SOURCES) 2>/dev/null | \ + $(VGAPI_SOURCES) 2>/dev/null | \ sed -e 's,^$(MAPI)/,,' > depend -include depend diff --git a/src/mapi/vgapi/SConscript b/src/mapi/vgapi/SConscript index 42d86b69ee..ee6d9fb827 100644 --- a/src/mapi/vgapi/SConscript +++ b/src/mapi/vgapi/SConscript @@ -44,13 +44,20 @@ if env['platform'] != 'winddk': env.Depends(vgapi_objects, vgapi_header) + # libOpenVG.dll + env['LIBPREFIX'] = 'lib' + env['SHLIBPREFIX'] = 'lib' + openvg = env.SharedLibrary( - target = 'libOpenVG', + target = 'OpenVG', source = vgapi_objects, ) env.InstallSharedLibrary(openvg, version=(1, 0, 0)) - vgapi = [env.FindIxes(openvg, 'LIBPREFIX', 'LIBSUFFIX')] + if env['platform'] == 'windows': + openvg = env.FindIxes(openvg, 'LIBPREFIX', 'LIBSUFFIX') + else: + openvg = env.FindIxes(openvg, 'SHLIBPREFIX', 'SHLIBSUFFIX') - Export(['vgapi']) + Export(['openvg']) |