#i106664# minor changes for building the sample

odk/examples/OLE/activex/Makefile

@@ -104,6 +104,7 @@ $(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)%.$(SHAREDLIB_EXT) : $(SLOFILES) $(OUT_COMP_GEN
 	/DEF:so_activex.def /IMPLIB:$(OUT_LIB)/iso_activex.lib $(SLOFILES) \
 	msvcrt.lib kernel32.lib user32.lib uuid.lib advapi32.lib ole32.lib oleaut32.lib gdi32.lib \
 	urlmon.lib Shlwapi.lib oldnames.lib $(CL_NEW_LIB) $(OUT_COMP_GEN)/so_activex.res
+	$(LINK_MANIFEST)
 
 ifeq "$(OS)" "WIN"
 OleActvieXComponentExample : $(COMPONENT_IMPL)

odk/examples/OLE/activex/example.html

@@ -11,9 +11,9 @@ First you should edit the example.html file!!!
 <!-- Please edit CODEBASE parameter -->
 <!-- In case ActiveX control is already registered the parameter can be removed -->
 <OBJECT CLASSID="clsid:67F2A879-82D5-4A6D-8CC5-FFB3C114B69D" width="500" height="500"
-        CODEBASE="..\..\..\WINexample.out\bin\so_activex.dll">
+        CODEBASE="<path_to_the_sdk_sample_output_dir>\bin\so_activex.dll">
 <!-- Full URL to a document
-	<PARAM NAME="src" VALUE="file:///d:/example.sxw">
+	<PARAM NAME="src" VALUE="file:///d:/tmp/test.odt">
 -->
 <!-- Just view the document, do not edit
 	<PARAM NAME="readonly" VALUE="true">

odk/examples/OLE/activex/so_activex.def

-; iervp.def : Declares the module parameters.
-
-LIBRARY      "so_activex.dll"
-
 EXPORTS
-	DllCanUnloadNow     @1 PRIVATE
-	DllGetClassObject   @2 PRIVATE
-	DllRegisterServer   @3 PRIVATE
-	DllUnregisterServer	@4 PRIVATE
+	DllCanUnloadNow PRIVATE
+	DllGetClassObject PRIVATE
+	DllRegisterServer PRIVATE
+	DllUnregisterServer PRIVATE

odk/util/makefile.mk

@@ -11,7 +11,7 @@ TARGET=odk
 ZIP1TARGET=odkexamples
 ZIP1FLAGS=-u -r
 ZIP1DIR=$(PRJ)
-ZIP1LIST=examples -x "*.svn*" -x "*CVS*" -x "*makefile.mk" -x "*Inspector*" -x "*Container1*" -x "*Storage*" -x "*register_component*" -x "*examples.html" -x "*ConverterServlet*" -x "*NotesAccess*"
+ZIP1LIST=examples -x "*.svn*" -x "*CVS*" -x "*makefile.mk" -x "*Inspector*" -x "*Container1*" -x "*Storage*" -x "*register_component*" -x "*examples.html" -x "*ConverterServlet*" -x "*NotesAccess*" -x "*delphi"
 
 .ENDIF