diff options
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/prj/build.lst | 2 | ||||
| -rw-r--r-- | pyuno/source/loader/pyuno_loader.cxx | 7 | ||||
| -rw-r--r-- | pyuno/source/module/makefile.mk | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/pyuno/prj/build.lst b/pyuno/prj/build.lst index a7c1c5b03426..e6e0914eb6e3 100644 --- a/pyuno/prj/build.lst +++ b/pyuno/prj/build.lst @@ -1,4 +1,4 @@ -bgpu pyuno : stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL +bgpu pyuno : stoc DESKTOP:cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL pu pyuno usr1 - all br_mkout NULL pu pyuno\zipcore nmake - all pu_zipcore NULL pu pyuno\source\module nmake - all pu_module NULL diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index 79fbae9ab098..96246b14ee7e 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -245,13 +245,6 @@ static struct cppu::ImplementationEntry g_entries[] = extern "C" { -//================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 627a97d711f7..935303f6fd9e 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -52,7 +52,9 @@ EXTRA_FRAMEWORK_FLAG=-framework Python .IF "$(GUI)" == "UNX" PYUNORC=pyunorc .ELSE +.IF "$(CROSS_COMPILING)" != "YES" .INCLUDE : pyversion.mk +.ENDIF PYUNORC=pyuno.ini DLLPOST=.pyd .ENDIF @@ -111,7 +113,7 @@ ALLTAR : \ $(LB)$/lib$(TARGET).a $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def - dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a + $(DLLTOOL) --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a .ELSE .IF "$(GUI)"!="WNT" |