Also update build script for Windows 32-bit

profiler/lib.profiler/native/build/buildnative-windows-16.bat

@@ -15,12 +15,20 @@ rem KIND, either express or implied.  See the License for the
 rem specific language governing permissions and limitations
 rem under the License.
 
+rem Edit the following line to set the JDK location (for JNI headers)
+rem or leave if you have JDK_HOME set.
+SET BUILD_JDK=%JDK_HOME%
+
+rem Do not alter below this line
 SET BUILD_SRC_15=..\src-jdk15
-SET BUILD_JDK=C:\PROGRA~1\java\jdk1.6.0_22
+SET BUILD_SRC=..\src
 SET BUILD_OUTPUT=%TEMP%\dist
 SET BUILD_DEPLOY=..\..\release\lib
 
 mkdir %BUILD_OUTPUT%\deployed\jdk16\windows
+mkdir %BUILD_DEPLOY%\deployed\jdk16\windows
+
+rc /Fo .\version.res %BUILD_SRC_15%\windows\version.rc
 
 cl /I%BUILD_JDK%\include /I%BUILD_JDK%\include\win32 ^
 %BUILD_SRC_15%\class_file_cache.c ^
@@ -32,14 +40,12 @@ cl /I%BUILD_JDK%\include /I%BUILD_JDK%\include\win32 ^
 %BUILD_SRC_15%\Threads.c ^
 %BUILD_SRC_15%\Stacks.c ^
 %BUILD_SRC_15%\common_functions.c ^
-/D WIN32 /MD /Ox /c
-
-rc /fo version.res %BUILD_SRC_15%\windows\version.rc
-
-link /DLL /NXCOMPAT /DYNAMICBASE /SAFESEH /NODEFAULTLIB:MSVCR80 /LIBPATH:%CRT_LIB_PATH% /MAP:%BUILD_OUTPUT%\deployed\jdk16\windows\profilerinterface.map /OUT:%BUILD_OUTPUT%\deployed\jdk16\windows\profilerinterface.dll ^
-Classes.obj HeapDump.obj Timers.obj GC.obj Threads.obj Stacks.obj common_functions.obj class_file_cache.obj attach.obj version.res
+version.res ^
+/D WIN32 /LD /MD /Ox ^
+/Fe:%BUILD_OUTPUT%\deployed\jdk16\windows\profilerinterface.dll ^
+/Fm:%BUILD_OUTPUT%\deployed\jdk16\windows\profilerinterface.map ^
+/link /DYNAMICBASE
 
-del vc60.pdb
 del *.obj *.res
 del %BUILD_OUTPUT%\deployed\jdk16\windows\*.lib %BUILD_OUTPUT%\deployed\jdk16\windows\*.exp %BUILD_OUTPUT%\deployed\jdk16\windows\*.ilk %BUILD_OUTPUT%\deployed\jdk16\windows\*.pdb