--- Begin Message ---
Package: netbeans
Version: 7.0.1+dfsg1-5
Severity: wishlist
Tags: patch
Dear Maintainer,
We're working on moving from mingw32 to mingw-w64 (see #648306). I
noticed recent versions of netbeans build-depend on mingw32; the
attached patch allows building with mingw-w64 instead. The changes
compared to mingw32 are three-fold:
* use i686-w64-mingw32 rather than i586-mingw32msvc;
* drop the "-mno-cygwin" flag which is no longer recognised;
* add a couple of missing "#include <stdio.h>" statements.
It would also be possible to drop the "-m32" and "-fPIC" flags. In
addition, Win64 binaries could be built using g++-mingw-w64-x86-64 but
I haven't looked into that for netbeans.
mingw32 will still be in wheezy so there's no particular hurry.
Regards,
Stephen
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing'), (500, 'stable'), (200, 'unstable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-2-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -urN netbeans-7.0.1+dfsg1.orig/debian/control netbeans-7.0.1+dfsg1/debian/control
--- netbeans-7.0.1+dfsg1.orig/debian/control 2012-02-19 23:17:16.000000000 +0100
+++ netbeans-7.0.1+dfsg1/debian/control 2012-07-05 00:44:17.000000000 +0200
@@ -5,7 +5,7 @@
Uploaders: Yulia Novozhilova <[email protected]>,
Andres Mejia <[email protected]>, Andrew Ross <[email protected]>
Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0),
- ant-optional (>= 1.7.0), default-jdk, mingw32, maven-repo-helper,
+ ant-optional (>= 1.7.0), default-jdk, g++-mingw-w64-i686, maven-repo-helper,
w3c-dtd-xhtml, javacc,
libjemmy2-java, javahelp2, libbindex-java,
libswing-layout-java (>= 1.0.3), libjna-java (>= 3.2.7-2~),
diff -urN netbeans-7.0.1+dfsg1.orig/debian/patches/netbeans-platform~windowslauncher.patch netbeans-7.0.1+dfsg1/debian/patches/netbeans-platform~windowslauncher.patch
--- netbeans-7.0.1+dfsg1.orig/debian/patches/netbeans-platform~windowslauncher.patch 2012-02-19 23:17:16.000000000 +0100
+++ netbeans-7.0.1+dfsg1/debian/patches/netbeans-platform~windowslauncher.patch 2012-07-05 22:51:19.000000000 +0200
@@ -1,16 +1,14 @@
-Use mingw32 to build the windows launchers. These are useful if the Netbeans platform is used to build
+Use mingw-w64 to build the windows launchers. These are useful if the Netbeans platform is used to build
another application on Debian which you want to be able to run on a Windows system.
-Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/Makefile
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/Makefile 2011-06-13 21:39:36.107758898 +0100
-+++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/Makefile 2011-06-14 23:46:57.388989761 +0100
+--- netbeans-7.0.1+dfsg1.orig/o.n.bootstrap/launcher/windows/Makefile
++++ netbeans-7.0.1+dfsg1/o.n.bootstrap/launcher/windows/Makefile
@@ -34,7 +34,7 @@
MKDIR=mkdir
CP=cp
CCADMIN=CCadmin
-RANLIB=ranlib
-+RANLIB=i586-mingw32msvc-ranlib
++RANLIB=i686-w64-mingw32-ranlib
# build
build: .build-post
@@ -20,15 +18,13 @@
nbexec.exe: nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
- windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
- g++ -s -mno-cygwin nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
-+ i586-mingw32msvc-windres -Ocoff nbexec_exe.rc nbexec_exe.res
-+ i586-mingw32msvc-g++ -s -mno-cygwin nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
++ i686-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe.res
++ i686-w64-mingw32-g++ -s nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
# clean
clean: .clean-post
-Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk 2011-06-13 21:39:36.137760501 +0100
-+++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk 2011-06-14 23:47:19.998990498 +0100
+--- netbeans-7.0.1+dfsg1.orig/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
++++ netbeans-7.0.1+dfsg1/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
@@ -11,12 +11,12 @@
MKDIR=mkdir
CP=cp
@@ -37,17 +33,34 @@
-CC=gcc
-CCC=g++
-CXX=g++
-+RANLIB=i586-mingw32msvc-ranlib
-+CC=i586-mingw32msvc-gcc
-+CCC=i586-mingw32msvc-g++
-+CXX=i586-mingw32msvc-g++
++RANLIB=i686-w64-mingw32-ranlib
++CC=i686-w64-mingw32-gcc
++CCC=i686-w64-mingw32-g++
++CXX=i686-w64-mingw32-g++
FC=
-AS=as
-+AS=i586-mingw32msvc-as
++AS=i686-w64-mingw32-as
# Macros
CND_PLATFORM=Cygwin-Windows
-@@ -65,22 +65,22 @@
+@@ -41,8 +41,8 @@
+ CFLAGS=-m32
+
+ # CC Compiler Flags
+-CCFLAGS=-m32 -s -mno-cygwin
+-CXXFLAGS=-m32 -s -mno-cygwin
++CCFLAGS=-m32 -s
++CXXFLAGS=-m32 -s
+
+ # Fortran Compiler Flags
+ FFLAGS=
+@@ -60,27 +60,27 @@
+ nbexec.dll: ${OBJECTDIR}/nbexec.res
+
+ nbexec.dll: ${OBJECTFILES}
+- ${LINK.cc} -mno-cygwin -shared -o nbexec.dll -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS}
++ ${LINK.cc} -shared -o nbexec.dll -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS}
+
${OBJECTDIR}/platformlauncher.o: nbproject/Makefile-${CND_CONF}.mk platformlauncher.cpp
${MKDIR} -p ${OBJECTDIR}
${RM} [email protected]
@@ -64,7 +77,7 @@
${MKDIR} -p ${OBJECTDIR}
@echo Compiling Resource files...
- windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
-+ i586-mingw32msvc-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
++ i686-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
${OBJECTDIR}/nbexecexe.o: nbproject/Makefile-${CND_CONF}.mk nbexecexe.cpp
${MKDIR} -p ${OBJECTDIR}
@@ -89,16 +102,14 @@
# Subprojects
.build-subprojects:
-Index: libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/Makefile
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/apisupport.harness/windows-launcher-src/Makefile 2011-06-14 23:46:57.338990509 +0100
-+++ libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/Makefile 2011-06-14 23:56:49.309005828 +0100
+--- netbeans-7.0.1+dfsg1.orig/apisupport.harness/windows-launcher-src/Makefile
++++ netbeans-7.0.1+dfsg1/apisupport.harness/windows-launcher-src/Makefile
@@ -34,7 +34,7 @@
MKDIR=mkdir
CP=cp
CCADMIN=CCadmin
-RANLIB=ranlib
-+RANLIB=i586-mingw32msvc-ranlib
++RANLIB=i686-w64-mingw32-ranlib
# build
@@ -107,7 +118,7 @@
app.res : app.rc
- windres -o$@ -Ocoff app.rc
-+ i586-mingw32msvc-windres -o$@ -Ocoff app.rc
++ i686-w64-mingw32-windres -o$@ -Ocoff app.rc
# clean
clean: .clean-post
@@ -115,10 +126,8 @@
.clean-pre:
# Add your pre 'clean' code here...
-Index: libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk 2011-06-14 23:46:57.358990425 +0100
-+++ libnb-platform-java-7.0+dfsg1/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk 2011-06-14 23:47:19.998990498 +0100
+--- netbeans-7.0.1+dfsg1.orig/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk
++++ netbeans-7.0.1+dfsg1/apisupport.harness/windows-launcher-src/nbproject/Makefile-Release.mk
@@ -11,10 +11,10 @@
MKDIR=mkdir
CP=cp
@@ -127,13 +136,24 @@
-CC=gcc.exe
-CCC=g++.exe
-CXX=g++.exe
-+RANLIB=i586-mingw32msvc-ranlib
-+CC=i586-mingw32msvc-gcc
-+CCC=i586-mingw32msvc-g++
-+CXX=i586-mingw32msvc-g++
++RANLIB=i686-w64-mingw32-ranlib
++CC=i686-w64-mingw32-gcc
++CCC=i686-w64-mingw32-g++
++CXX=i686-w64-mingw32-g++
FC=
AS=
+@@ -38,8 +38,8 @@
+ CFLAGS=
+
+ # CC Compiler Flags
+-CCFLAGS=-m32 -s -mno-cygwin
+-CXXFLAGS=-m32 -s -mno-cygwin
++CCFLAGS=-m32 -s
++CXXFLAGS=-m32 -s
+
+ # Fortran Compiler Flags
+ FFLAGS=
@@ -84,7 +84,7 @@
# Clean Targets
.clean-conf:
@@ -143,10 +163,8 @@
# Subprojects
.clean-subprojects:
-Index: libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/jvmlauncher.h
-===================================================================
---- libnb-platform-java-7.0+dfsg1.orig/o.n.bootstrap/launcher/windows/jvmlauncher.h 2011-06-14 23:46:57.428989809 +0100
-+++ libnb-platform-java-7.0+dfsg1/o.n.bootstrap/launcher/windows/jvmlauncher.h 2011-06-15 18:56:36.509511571 +0100
+--- netbeans-7.0.1+dfsg1.orig/o.n.bootstrap/launcher/windows/jvmlauncher.h
++++ netbeans-7.0.1+dfsg1/o.n.bootstrap/launcher/windows/jvmlauncher.h
@@ -50,6 +50,18 @@
#include <windows.h>
#include <string>
@@ -166,3 +184,242 @@
#include "jni.h"
#include "utilsfuncs.h"
+--- netbeans-7.0.1+dfsg1.orig/apisupport.harness/windows-launcher-src/nbproject/configurations.xml
++++ netbeans-7.0.1+dfsg1/apisupport.harness/windows-launcher-src/nbproject/configurations.xml
+@@ -44,7 +44,7 @@
+ <includeDirectories>
+ <directoryPath>c:/cygwin/usr/include/mingw</directoryPath>
+ </includeDirectories>
+- <commandLine>-s -mno-cygwin</commandLine>
++ <commandLine>-s</commandLine>
+ <warningLevel>2</warningLevel>
+ </ccCompilerTool>
+ <fortranCompilerTool>
+--- netbeans-7.0.1+dfsg1.orig/cnd.debugger.common2/windows/Makefile
++++ netbeans-7.0.1+dfsg1/cnd.debugger.common2/windows/Makefile
+@@ -54,10 +54,10 @@
+ all: GdbKillProc
+
+ GdbKillProc: GdbKillProc.o
+- gcc -O -o GdbKillProc GdbKillProc.o -mno-cygwin -mthreads
++ gcc -O -o GdbKillProc GdbKillProc.o -mthreads
+
+ GdbKillProc.o: GdbKillProc.c
+- gcc -c -O GdbKillProc.c -mno-cygwin -mthreads
++ gcc -c -O GdbKillProc.c -mthreads
+
+ clean:
+ rm -f GdbKillProc.exe GdbKillProc.o
+--- netbeans-7.0.1+dfsg1.orig/cnd.makeproject/test/unit/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriterTest.java
++++ netbeans-7.0.1+dfsg1/cnd.makeproject/test/unit/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriterTest.java
+@@ -510,7 +510,7 @@
+ golden.append("\t$(COMPILE.cc) -g -MMD -MP -MF [email protected] -o "+MakeConfiguration.OBJECTDIR_MACRO+"/test.o test.cc\n");
+ golden.append("${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libXxx.dll: ${OBJECTFILES}\n");
+ golden.append("\t${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}\n");
+- golden.append("\t${LINK.cc} -mno-cygwin -shared -o "+MakeConfiguration.CND_DISTDIR_MACRO+"/"+MakeConfiguration.CND_CONF_MACRO+"/"+MakeConfiguration.CND_PLATFORM_MACRO+"/libXxx.dll ${OBJECTFILES} ${LDLIBSOPTIONS} \n");
++ golden.append("\t${LINK.cc} -shared -o "+MakeConfiguration.CND_DISTDIR_MACRO+"/"+MakeConfiguration.CND_CONF_MACRO+"/"+MakeConfiguration.CND_PLATFORM_MACRO+"/libXxx.dll ${OBJECTFILES} ${LDLIBSOPTIONS} \n");
+ testDynamicLibrary("DynLib_Cygwin_Windows", "Cygwin", PlatformTypes.PLATFORM_WINDOWS, golden.toString());
+ }
+ }
+--- netbeans-7.0.1+dfsg1.orig/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/resources/toolchaindefinition/Cygwin_linker.xml
++++ netbeans-7.0.1+dfsg1/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/resources/toolchaindefinition/Cygwin_linker.xml
+@@ -49,6 +49,6 @@
+ <library_prefix stringvalue="cyg"/>
+ <dynamic_library_search flags=""/>
+ <PIC flags=""/>
+- <dynamic_library_basic flags="-mno-cygwin -shared "/>
++ <dynamic_library_basic flags=" -shared "/>
+ </linker>
+ </toolchaindefinition>
+--- netbeans-7.0.1+dfsg1.orig/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/resources/toolchaindefinition/WinAVR_linker.xml
++++ netbeans-7.0.1+dfsg1/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/resources/toolchaindefinition/WinAVR_linker.xml
+@@ -49,6 +49,6 @@
+ <library_prefix stringvalue="cyg"/>
+ <dynamic_library_search flags=""/>
+ <PIC flags=""/>
+- <dynamic_library_basic flags="-mno-cygwin -shared "/>
++ <dynamic_library_basic flags=" -shared "/>
+ </linker>
+ </toolchaindefinition>
+--- netbeans-7.0.1+dfsg1.orig/dlight.nativeexecution/tools/Makefile
++++ netbeans-7.0.1+dfsg1/dlight.nativeexecution/tools/Makefile
+@@ -44,7 +44,7 @@
+
+ testit :sh= uname -s
+
+-#CFLAGS-Windows_XP := -mno-cygwin
++#CFLAGS-Windows_XP :=
+ CFLAGS-Linux := -fPIC -Wl,--hash-style=sysv
+ CFLAGS-SunOS := -fPIC
+ CFLAGS-Mac_OS_X := -fPIC
+--- netbeans-7.0.1+dfsg1.orig/ide/launcher/windows/nbproject/Makefile-netbeans.exe.mk
++++ netbeans-7.0.1+dfsg1/ide/launcher/windows/nbproject/Makefile-netbeans.exe.mk
+@@ -37,8 +37,8 @@
+ CFLAGS=
+
+ # CC Compiler Flags
+-CCFLAGS=-m32 -s -mno-cygwin
+-CXXFLAGS=-m32 -s -mno-cygwin
++CCFLAGS=-m32 -s
++CXXFLAGS=-m32 -s
+
+ # Fortran Compiler Flags
+ FFLAGS=
+--- netbeans-7.0.1+dfsg1.orig/ide/launcher/windows/nbproject/configurations.xml
++++ netbeans-7.0.1+dfsg1/ide/launcher/windows/nbproject/configurations.xml
+@@ -40,7 +40,7 @@
+ <includeDirectories>
+ <directoryPath>c:/cygwin/usr/include/mingw</directoryPath>
+ </includeDirectories>
+- <commandLine>-s -mno-cygwin</commandLine>
++ <commandLine>-s</commandLine>
+ <warningLevel>2</warningLevel>
+ </ccCompilerTool>
+ <linkerTool>
+--- netbeans-7.0.1+dfsg1.orig/nbi/engine/native/cleaner/windows/nbproject/Makefile-Debug.mk
++++ netbeans-7.0.1+dfsg1/nbi/engine/native/cleaner/windows/nbproject/Makefile-Debug.mk
+@@ -47,7 +47,7 @@
+
+ dist/cleaner.exe: ${OBJECTFILES}
+ ${MKDIR} -p dist
+- ${LINK.c} -mno-cygwin -mwindows -o dist/cleaner -s ${OBJECTFILES} ${LDLIBSOPTIONS}
++ ${LINK.c} -mwindows -o dist/cleaner -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+ ${OBJECTDIR}/src/main.o: src/main.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+--- netbeans-7.0.1+dfsg1.orig/nbi/engine/native/cleaner/windows/nbproject/configurations.xml
++++ netbeans-7.0.1+dfsg1/nbi/engine/native/cleaner/windows/nbproject/configurations.xml
+@@ -77,7 +77,7 @@
+ <linkerLibItems>
+ <linkerOptionItem>-lshell32 -lkernel32</linkerOptionItem>
+ </linkerLibItems>
+- <commandLine>-mno-cygwin -mwindows</commandLine>
++ <commandLine> -mwindows</commandLine>
+ </linkerTool>
+ </compileType>
+ <item path="src/main.c">
+--- netbeans-7.0.1+dfsg1.orig/nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-32bit.mk
++++ netbeans-7.0.1+dfsg1/nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-32bit.mk
+@@ -61,11 +61,11 @@
+ ${OBJECTDIR}/src/WindowsUtils.o
+
+ # C Compiler Flags
+-CFLAGS=-mno-cygwin
++CFLAGS=
+
+ # CC Compiler Flags
+-CCFLAGS=-mno-cygwin
+-CXXFLAGS=-mno-cygwin
++CCFLAGS=
++CXXFLAGS=
+
+ # Fortran Compiler Flags
+ FFLAGS=
+--- netbeans-7.0.1+dfsg1.orig/nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-64bit.mk
++++ netbeans-7.0.1+dfsg1/nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-64bit.mk
+@@ -61,11 +61,11 @@
+ ${OBJECTDIR}/src/WindowsUtils.o
+
+ # C Compiler Flags
+-CFLAGS=-mno-cygwin
++CFLAGS=
+
+ # CC Compiler Flags
+-CCFLAGS=-mno-cygwin
+-CXXFLAGS=-mno-cygwin
++CCFLAGS=
++CXXFLAGS=
+
+ # Fortran Compiler Flags
+ FFLAGS=
+--- netbeans-7.0.1+dfsg1.orig/nbi/engine/native/jnilib/windows/nbproject/configurations.xml
++++ netbeans-7.0.1+dfsg1/nbi/engine/native/jnilib/windows/nbproject/configurations.xml
+@@ -85,7 +85,7 @@
+ <directoryPath>/usr/java/include</directoryPath>
+ <directoryPath>/usr/java/include/win32</directoryPath>
+ </includeDirectories>
+- <commandLine>-mno-cygwin</commandLine>
++ <commandLine></commandLine>
+ </cCompilerTool>
+ <ccCompilerTool>
+ <developmentMode>0</developmentMode>
+@@ -94,7 +94,7 @@
+ <directoryPath>/usr/java/include</directoryPath>
+ <directoryPath>/usr/java/include\win32</directoryPath>
+ </includeDirectories>
+- <commandLine>-mno-cygwin</commandLine>
++ <commandLine></commandLine>
+ </ccCompilerTool>
+ <linkerTool>
+ <output>dist/windows.dll</output>
+@@ -147,7 +147,7 @@
+ <directoryPath>/usr/java/include</directoryPath>
+ <directoryPath>/usr/java/include/win32</directoryPath>
+ </includeDirectories>
+- <commandLine>-mno-cygwin</commandLine>
++ <commandLine></commandLine>
+ </cCompilerTool>
+ <ccCompilerTool>
+ <developmentMode>0</developmentMode>
+@@ -156,7 +156,7 @@
+ <directoryPath>/usr/java/include</directoryPath>
+ <directoryPath>/usr/java/include\win32</directoryPath>
+ </includeDirectories>
+- <commandLine>-mno-cygwin</commandLine>
++ <commandLine></commandLine>
+ </ccCompilerTool>
+ <linkerTool>
+ <output>dist/windows.dll</output>
+--- netbeans-7.0.1+dfsg1.orig/nbi/engine/native/launcher/windows/nbproject/Makefile-Debug.mk
++++ netbeans-7.0.1+dfsg1/nbi/engine/native/launcher/windows/nbproject/Makefile-Debug.mk
+@@ -58,7 +58,7 @@
+
+ dist/nlw.exe: ${OBJECTFILES}
+ ${MKDIR} -p dist
+- ${LINK.c} -mwindows -mno-cygwin build/icon.o -o dist/nlw -s ${OBJECTFILES} ${LDLIBSOPTIONS}
++ ${LINK.c} -mwindows build/icon.o -o dist/nlw -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+ ${OBJECTDIR}/src/FileUtils.o: src/FileUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+--- netbeans-7.0.1+dfsg1.orig/nbi/engine/native/launcher/windows/nbproject/configurations.xml
++++ netbeans-7.0.1+dfsg1/nbi/engine/native/launcher/windows/nbproject/configurations.xml
+@@ -104,7 +104,7 @@
+ <linkerLibItems>
+ <linkerOptionItem>-lole32 -luuid -lkernel32 -lcomctl32 -luserenv</linkerOptionItem>
+ </linkerLibItems>
+- <commandLine>-mwindows -mno-cygwin build/icon.o</commandLine>
++ <commandLine>-mwindows build/icon.o</commandLine>
+ </linkerTool>
+ </compileType>
+ <item path="resources/res.rc">
+--- netbeans-7.0.1+dfsg1.orig/o.n.bootstrap/launcher/windows/nbproject/configurations.xml
++++ netbeans-7.0.1+dfsg1/o.n.bootstrap/launcher/windows/nbproject/configurations.xml
+@@ -57,7 +57,7 @@
+ <pElem>D:/Program Files/Java/jdk1.6.0_22/include/win32</pElem>
+ <pElem>D:/Program Files/Java/jdk1.6.0_22/include</pElem>
+ </incDir>
+- <commandLine>-s -mno-cygwin</commandLine>
++ <commandLine>-s</commandLine>
+ <warningLevel>2</warningLevel>
+ </ccTool>
+ <linkerTool>
+--- netbeans-7.0.1+dfsg1.orig/ide/launcher/windows/nblauncher.cpp
++++ netbeans-7.0.1+dfsg1/ide/launcher/windows/nblauncher.cpp
+@@ -44,6 +44,7 @@
+ * Author: Tomas Holy
+ */
+
++#include <stdio.h>
+ #include "nblauncher.h"
+ #include "../../../o.n.bootstrap/launcher/windows/utilsfuncs.h"
+ #include "../../../o.n.bootstrap/launcher/windows/argnames.h"
+--- netbeans-7.0.1+dfsg1.orig/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
++++ netbeans-7.0.1+dfsg1/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+@@ -44,6 +44,7 @@
+ * Author: Tomas Holy
+ */
+
++#include <stdio.h>
+ #include "utilsfuncs.h"
+ #include "argnames.h"
+ #include <tlhelp32.h>
--- End Message ---
