diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-21 18:12:16 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-21 18:12:16 -0500 |
commit | 0d4720d1e1ffcefc43ae2af59c7487ab0bfab2ce (patch) | |
tree | 7cacea747b7ff3de52f69a8605ef486463201a9c /embedserv | |
parent | 57b992c0b57daba5f44b5c4cdb08e817f355ea01 (diff) |
undo anything not wizard related in the previous merge-commit
Diffstat (limited to 'embedserv')
-rw-r--r-- | embedserv/prj/build.lst | 2 | ||||
-rw-r--r-- | embedserv/prj/d.lst | 4 | ||||
-rw-r--r-- | embedserv/source/inc/embservconst.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/embedserv/prj/build.lst b/embedserv/prj/build.lst index 189479e4bca3..a6cfd10ea298 100644 --- a/embedserv/prj/build.lst +++ b/embedserv/prj/build.lst @@ -1,4 +1,4 @@ -es embedserv : offuh sal cppu cppuhelper comphelper LIBXSLT:libxslt NULL +es embedserv : offapi sal cppu cppuhelper comphelper LIBXSLT:libxslt NULL es embedserv usr1 - w es_mkout NULL es embedserv\source\embed nmake - w es_embed NULL es embedserv\source\inprocserv nmake - w es_inproc NULL diff --git a/embedserv/prj/d.lst b/embedserv/prj/d.lst index e01fbabf84e0..292dfe821cd3 100644 --- a/embedserv/prj/d.lst +++ b/embedserv/prj/d.lst @@ -1,2 +1,2 @@ -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\misc\emser.component %_DEST%\xml%_EXT%\emser.component +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll +..\%__SRC%\misc\emser.component %_DEST%\xml\emser.component diff --git a/embedserv/source/inc/embservconst.h b/embedserv/source/inc/embservconst.h index e682ec4aa5ee..d045c7837b57 100644 --- a/embedserv/source/inc/embservconst.h +++ b/embedserv/source/inc/embservconst.h @@ -29,7 +29,7 @@ #ifndef _EMBSERVCONST_H_ #define _EMBSERVCONST_H_ -#include <initguid.h> +#include <guiddef.h> #ifndef _COMPHELPER_CLASSIDS_HXX #include <comphelper/classids.hxx> |