1.1 --- a/o.n.bootstrap/launcher/windows/Makefile Thu Mar 06 12:09:24 2014 +0100
1.2 +++ b/o.n.bootstrap/launcher/windows/Makefile Thu Mar 13 10:26:59 2014 +0100
1.3 @@ -27,13 +27,13 @@
1.4
1.5 .build-post-nbexec: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
1.6 windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
1.7 - g++ -s -mno-cygwin -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
1.8 + g++ -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
1.9 cp nbexec.exe ../../../nbbuild/netbeans/platform/lib/
1.10 cp nbexec.dll ../../../nbbuild/netbeans/platform/lib/
1.11
1.12 .build-post-nbexec64: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
1.13 x86_64-w64-mingw32-windres.exe -Ocoff nbexec_exe.rc nbexec_exe64.res
1.14 - x86_64-w64-mingw32-g++.exe -m64 -s -mno-cygwin -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe
1.15 + x86_64-w64-mingw32-g++.exe -m64 -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe
1.16 cp nbexec64.exe ../../../nbbuild/netbeans/platform/lib/
1.17 cp nbexec64.dll ../../../nbbuild/netbeans/platform/lib/
1.18
2.1 Binary file o.n.bootstrap/launcher/windows/nbexec.dll has changed
3.1 Binary file o.n.bootstrap/launcher/windows/nbexec.exe has changed
4.1 Binary file o.n.bootstrap/launcher/windows/nbexec64.dll has changed
5.1 Binary file o.n.bootstrap/launcher/windows/nbexec64.exe has changed
6.1 Binary file o.n.bootstrap/launcher/windows/nbexec_exe64.res has changed
7.1 --- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk Thu Mar 06 12:09:24 2014 +0100
7.2 +++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk Thu Mar 13 10:26:59 2014 +0100
7.3 @@ -70,12 +70,12 @@
7.4 ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp
7.5 ${MKDIR} -p ${OBJECTDIR}
7.6 ${RM} "$@.d"
7.7 - $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
7.8 + $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
7.9
7.10 ${OBJECTDIR}/nbexec.o: nbexec.cpp
7.11 ${MKDIR} -p ${OBJECTDIR}
7.12 ${RM} "$@.d"
7.13 - $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
7.14 + $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
7.15
7.16 ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
7.17 ${MKDIR} -p ${OBJECTDIR}
7.18 @@ -89,17 +89,17 @@
7.19 ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp
7.20 ${MKDIR} -p ${OBJECTDIR}
7.21 ${RM} "$@.d"
7.22 - $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
7.23 + $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
7.24
7.25 ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp
7.26 ${MKDIR} -p ${OBJECTDIR}
7.27 ${RM} "$@.d"
7.28 - $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
7.29 + $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
7.30
7.31 ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp
7.32 ${MKDIR} -p ${OBJECTDIR}
7.33 ${RM} "$@.d"
7.34 - $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_17/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
7.35 + $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_45/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
7.36
7.37 # Subprojects
7.38 .build-subprojects:
8.1 --- a/o.n.bootstrap/launcher/windows/nbproject/configurations.xml Thu Mar 06 12:09:24 2014 +0100
8.2 +++ b/o.n.bootstrap/launcher/windows/nbproject/configurations.xml Thu Mar 13 10:26:59 2014 +0100
8.3 @@ -124,8 +124,8 @@
8.4 <stripSymbols>true</stripSymbols>
8.5 <architecture>2</architecture>
8.6 <incDir>
8.7 - <pElem>C:/Program Files/Java/jdk1.7.0_17/include</pElem>
8.8 - <pElem>C:/Program Files/Java/jdk1.7.0_17/include/win32</pElem>
8.9 + <pElem>C:/Program Files/Java/jdk1.7.0_45/include</pElem>
8.10 + <pElem>C:/Program Files/Java/jdk1.7.0_45/include/win32</pElem>
8.11 </incDir>
8.12 <commandLine>-mno-cygwin -static-libgcc -static-libstdc++</commandLine>
8.13 <preprocessorList>