diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | include/postmac.h (renamed from solenv/inc/postmac.h) | 0 | ||||
| -rw-r--r-- | include/postwin.h (renamed from solenv/inc/postwin.h) | 0 | ||||
| -rw-r--r-- | include/premac.h (renamed from solenv/inc/premac.h) | 0 | ||||
| -rw-r--r-- | include/prewin.h (renamed from solenv/inc/prewin.h) | 0 | ||||
| -rw-r--r-- | include/shlinfo.rc (renamed from solenv/inc/shlinfo.rc) | 0 | ||||
| -rw-r--r-- | include/version.hrc (renamed from solenv/inc/version.hrc) | 0 | ||||
| -rw-r--r-- | include/wntgcci/jni_md.h (renamed from solenv/inc/win32/jni_md.h) | 0 | ||||
| -rw-r--r-- | include/wntgcci/sehandler.hxx (renamed from solenv/inc/wntgcci/sehandler.hxx) | 0 |
9 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 64e574e72c02..d2db9e76d94a 100644 --- a/configure.ac +++ b/configure.ac @@ -3769,7 +3769,6 @@ linux-android*) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; esac - SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/$OUTPATH" SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib" ;; @@ -3801,7 +3800,7 @@ mingw*) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; esac - SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32 -I$SRC_ROOT/solenv/inc/$OUTPATH" + SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgcci" SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib" ;; @@ -3941,7 +3940,7 @@ else INSTDIR=${BUILDDIR}/instdir/${INPATH} fi OUTDIR="${SOLARVER}/${INPATH}" -SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I${INSTDIR}/${SDKDIR}/include -I$SRC_ROOT/solenv/inc $SOLARINC" +SOLARINC="-I. -I$SRC_ROOT/include -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I${INSTDIR}/${SDKDIR}/include $SOLARINC" AC_SUBST(COM) AC_SUBST(CPU) AC_SUBST(CPUNAME) diff --git a/solenv/inc/postmac.h b/include/postmac.h index f157e678262a..f157e678262a 100644 --- a/solenv/inc/postmac.h +++ b/include/postmac.h diff --git a/solenv/inc/postwin.h b/include/postwin.h index 1ec09435b5cb..1ec09435b5cb 100644 --- a/solenv/inc/postwin.h +++ b/include/postwin.h diff --git a/solenv/inc/premac.h b/include/premac.h index f6e37475795f..f6e37475795f 100644 --- a/solenv/inc/premac.h +++ b/include/premac.h diff --git a/solenv/inc/prewin.h b/include/prewin.h index 837dfa093872..837dfa093872 100644 --- a/solenv/inc/prewin.h +++ b/include/prewin.h diff --git a/solenv/inc/shlinfo.rc b/include/shlinfo.rc index 2176bbf9937d..2176bbf9937d 100644 --- a/solenv/inc/shlinfo.rc +++ b/include/shlinfo.rc diff --git a/solenv/inc/version.hrc b/include/version.hrc index 305dc47afdc0..305dc47afdc0 100644 --- a/solenv/inc/version.hrc +++ b/include/version.hrc diff --git a/solenv/inc/win32/jni_md.h b/include/wntgcci/jni_md.h index b7aab253b350..b7aab253b350 100644 --- a/solenv/inc/win32/jni_md.h +++ b/include/wntgcci/jni_md.h diff --git a/solenv/inc/wntgcci/sehandler.hxx b/include/wntgcci/sehandler.hxx index 2fabe486a452..2fabe486a452 100644 --- a/solenv/inc/wntgcci/sehandler.hxx +++ b/include/wntgcci/sehandler.hxx |