diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-16 16:25:27 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-09-16 16:26:03 +0200 |
commit | bb5bdbbdca966c03e6b22b455630381154cb6d01 (patch) | |
tree | e742242194c16bb1f2572a7bdbd6b81424654367 /extensions | |
parent | can't guess the right paths for the internal python on macox (diff) | |
download | core-bb5bdbbdca966c03e6b22b455630381154cb6d01.tar.gz core-bb5bdbbdca966c03e6b22b455630381154cb6d01.zip |
Revert "Trying to chop out the uwinapi library"
This reverts commit 2dea0dab4fafda3c10a5bd03ad15ed39a4658b51.
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/activex/main/makefile.mk | 2 | ||||
-rw-r--r-- | extensions/test/ole/cpptest/readme.txt | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index 75dc947aaae9..ea70b66d0f0f 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -39,6 +39,7 @@ use_shl_versions= VERSIONOBJ= LIBTARGET=NO USE_DEFFILE=YES +UWINAPILIB= .IF "$(BUILD_X64)"!="" USE_DEFFILE_X64=TRUE @@ -106,6 +107,7 @@ SHL1RES=$(RES)$/$(TARGET).res CDEFS_X64+:=$(foreach,i,$(CDEFS) $(subst,-D_X86_=1, $i)) LIBTARGET_X64=NO USE_DEFFILE_X64=YES +UWINAPILIB_X64= SLOFILES_X64= \ $(SLO_X64)$/so_activex.obj \ diff --git a/extensions/test/ole/cpptest/readme.txt b/extensions/test/ole/cpptest/readme.txt index b3756da3e381..4af8cfee39af 100644 --- a/extensions/test/ole/cpptest/readme.txt +++ b/extensions/test/ole/cpptest/readme.txt @@ -1,2 +1,6 @@ Creates the com.sun.star.ServiceManager with CoCreateInstance in a cpp program. This little program can be used as starting point for further tests. + + +It needs uwinapi.dll, which is in the program folder of OOo (URE\bin in +OOo 3.0) |