summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2011-08-02 18:14:21 +0200
committerAndras Timar <atimar@suse.com>2012-10-13 12:24:27 +0200
commitf6f3443d96146fa68468a8c2bf630f05bc656f61 (patch)
treedf1679e3df7ad19134240c50f5ea36f403fcbc3f
parentCrash fix. (diff)
downloadcore-f6f3443d96146fa68468a8c2bf630f05bc656f61.tar.gz
core-f6f3443d96146fa68468a8c2bf630f05bc656f61.zip
[mono] mono-scp2.diff: add mono support
Conflicts: scp2/source/ooo/makefile.mk Change-Id: I5b65933015051aa3a03c7151d39d6d68072273a6
-rw-r--r--scp2/InstallModule_ooo.mk1
-rw-r--r--scp2/source/ooo/file_library_ooo.scp6
-rw-r--r--scp2/source/ooo/ure.scp54
3 files changed, 45 insertions, 16 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 0c494146fb82..bcee07e78419 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
ENABLE_KDE \
ENABLE_KDE4 \
ENABLE_LOMENUBAR \
+ ENABLE_MONO \
ENABLE_NSPLUGIN \
ENABLE_ONLINE_UPDATE \
ENABLE_OPENGL \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 66c50e2c7dad..87f6952a1f40 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -114,7 +114,7 @@ STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Lib_Cli_Oootypes_Assembly
TXT_FILE_BODY;
@@ -131,7 +131,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Lib_Policy_Cli_Oootypes_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -147,7 +147,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Lib_Policy_Cli_Oootypes_Config
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index be2c52f4d78f..63e09ec416f6 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Cli_Uno
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno
End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Cli_Ure_Assembly
TXT_FILE_BODY;
@@ -466,7 +466,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Policy_Cli_Ure_Assembly
TXT_FILE_BODY;
@@ -483,7 +483,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Policy_Cli_Ure_Config
TXT_FILE_BODY;
@@ -495,7 +495,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Cli_Basetypes_Assembly
TXT_FILE_BODY;
@@ -512,7 +512,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Policy_Cli_Basetypes_Assembly
TXT_FILE_BODY;
@@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Policy_Cli_Basetypes_Config
TXT_FILE_BODY;
@@ -541,7 +541,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Cli_Uretypes_Assembly
TXT_FILE_BODY;
@@ -558,7 +558,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Policy_Cli_Uretypes_Assembly
TXT_FILE_BODY;
@@ -575,7 +575,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Dl_Policy_Cli_Uretypes_Config
TXT_FILE_BODY;
@@ -587,7 +587,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Lib_Cli_Cppuhelper_Assembly
TXT_FILE_BODY;
@@ -604,7 +604,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
TXT_FILE_BODY;
@@ -621,7 +621,7 @@ End
#endif
-#if defined _MSC_VER
+#if defined _MSC_VER || defined ENABLE_MONO
File gid_File_Lib_Policy_Cli_Cppuhelper_Config
TXT_FILE_BODY;
@@ -633,6 +633,33 @@ End
#endif
+#ifdef ENABLE_MONO
+
+File gid_File_Lib_Cli_Uno_Glue
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_URE_DL_DIR;
+ #ifdef UNX
+ Name = STRING(CONCAT2(libcli_uno_glue,UNXSUFFIX));
+ #else
+ Name = "cli_uno_glue.dll";
+ #endif
+End
+
+File gid_File_Lib_Cli_Uno_Bridge_Assembly
+ TXT_FILE_BODY;
+ Styles = (PACKED, ASSEMBLY);
+ Name = "cli_uno_bridge.dll";
+ Dir = SCP2_URE_DL_DIR;
+ Assemblyname = "cli_uno_bridge";
+ PublicKeyToken = "ce2cb7e279207b9e";
+ Version = "1.0.0.0";
+ Culture = "neutral";
+ Attributes = "0";
+End
+
+#endif
+
#if defined SOLAR_JAVA
File gid_File_Dl_Jpipe
LIB_FILE_BODY;
@@ -1050,6 +1077,7 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Cli_Cppuhelper_Assembly,
gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
gid_File_Lib_Policy_Cli_Cppuhelper_Config,
+ gid_File_Lib_Cli_Uno_Glue,
gid_File_Dl_Cppu,
gid_Unixlink_File_Dl_Cppu,
gid_File_Dl_Cppuhelper,