diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-03-10 16:36:40 +0100 |
| commit | 393382f1bbbecd85d58378571a91e6cf3108ca4c (patch) | |
| tree | dc9e4f538714b1c4f86344a17f27c6cda37bda2d /set_soenv.in | |
| parent | f92271ee18b11a7bcd424f0583ae3f36954ffb7f (diff) | |
| parent | 34dfbf55a3363739f588aae68229cbead0c38d93 (diff) | |
ause110: update to DEV300_m74
Diffstat (limited to 'set_soenv.in')
| -rw-r--r-- | set_soenv.in | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/set_soenv.in b/set_soenv.in index 90d6582f5f1e..b8f3afc96d87 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -594,7 +594,6 @@ elsif ( $platform =~ m/osf1/ ) } elsif ( $platform =~ m/cygwin/ ) { - $COMPATH = PathFormat('@COMPATH@'); $MSPDB_PATH = PathFormat('@MSPDB_PATH@'); $MIDL_PATH = PathFormat('@MIDL_PATH@'); $CSC_PATH = PathFormat('@CSC_PATH@'); @@ -619,6 +618,8 @@ elsif ( $platform =~ m/cygwin/ ) $FLIPCMD = "slfl.pl"; $PATH_SEPERATOR = ';'; $outfile = "winmingw.set"; + $COMPATH = PathFormat('@COMPATH@/bin'); + $COMPATH =~ s/\/bin$//i; $COM = "GCC"; $CVER = "C341"; $OUTPATH = "wntgcci"; @@ -627,6 +628,7 @@ elsif ( $platform =~ m/cygwin/ ) } else # The MSVC section starts here { $outfile = "winenv.set"; + $COMPATH = PathFormat('@COMPATH@'); $COM = "MSC"; $OUTPATH = "wntmsci@COMEX@"; $INPATH = $OUTPATH.$PROEXT; @@ -1842,6 +1844,13 @@ ToFile( "SYSTEM_EXPAT", "@SYSTEM_EXPAT@", "e" ); ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" ); ToFile( "DB_VERSION", "@DB_VERSION@", "e" ); ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" ); +ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" ); +ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" ); +ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" ); +ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" ); +ToFile( "MYSQL_LIB", "@MYSQL_LIB@", "e" ); +ToFile( "MYSQL_DEFINES", "@MYSQL_DEFINES@", "e" ); +ToFile( "LIBMYSQL_PATH", "@LIBMYSQL_PATH@", "e" ); ToFile( "SYSTEM_HSQLDB", "@SYSTEM_HSQLDB@", "e" ); ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" ); ToFile( "SYSTEM_LUCENE", "@SYSTEM_LUCENE@", "e" ); |