[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in

[Libreoffice Gerrit user]

 set_soenv.in |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 121f93cb4903631daafcb4fc645ce5b43aef8262
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sun Nov 25 23:45:12 2018 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Sun Nov 25 23:45:12 2018 +0000

    Set up the AWTLIB variable on Windows too.
    
    This gets main/bean building on Windows.
    
    Patch by: me

diff --git a/set_soenv.in b/set_soenv.in
index 70098462629c..00c09466b9a1 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1834,6 +1834,15 @@ else {
 if ( $GUI eq "UNX" ) {
    ToFile( "AWTLIB",           '@AWTLIB@',          "e" );
 }
+else {
+   if ( $GUI eq "WNT" ) {
+      if ( "@COM@" eq "GCC" ) {
+         ToFile( "AWTLIB",     '@JAVA_HOME@/lib/jawt.lib', "e" );
+      } else {
+         ToFile( "AWTLIB",     'jawt.lib', "e" );
+      }
+   }
+}
 if ( '@JDK@' ne '' )
 { 
    ToFile( "JDK",             "@JDK@",           "e" );