diff options
| author | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-25 12:46:45 +0100 |
| commit | 35ec6ba5ee783c18484b4b19eab687a1b6ef2544 (patch) | |
| tree | ee2839e7c9e6b1b6bb7316e8843e63bea206bf2b /set_soenv.in | |
| parent | effed40ee9822d032cb506a25090f7e8b8dfa574 (diff) | |
| parent | 19c6c82576734fb8a8dee5d6c07b2aec7186e545 (diff) | |
sb118: merged in DEV300_m72
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 5c6413ad5d6d..77a3d88c7c9d 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -593,7 +593,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@'); @@ -618,6 +617,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"; @@ -626,6 +627,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; @@ -1815,6 +1817,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" ); |