Index: depends/build/rules.mak
===================================================================
--- depends/build/rules.mak (revision 507827)
+++ depends/build/rules.mak (working copy)
@@ -13,6 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+!IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64"
+ml=ml64
+# don't quite know what to specify as an entry point on win/em64t
+ENTRY_OPTION=
+!ELSE
+ml=ml
+ENTRY_OPTION=-entry:_DllMainCRTStartup@12
+!ENDIF
+
.c.obj:
$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
@@ -20,7 +29,7 @@
$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.cpp
.asm.obj:
- ml /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
+ $(ml) /Fo$*.obj /c /Cp /W3 /nologo /coff /Zm /Zd /Zi /Gd $(VMASMDEBUG) -DWIN32 $<
.rc.res:
rc -I..\include $<
@@ -37,7 +46,7 @@
!ifdef DLLNAME
$(DLLNAME): $(LIBNAME)
link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
- -entry:_DllMainCRTStartup@12 -dll /BASE:$(DLLBASE) -machine:$(CPU) \
+ $(ENTRY_OPTION) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
$(COMMENT) \
-subsystem:windows -out:$@ -map:$*.map \
$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
Index: depends/build/defines.mak
===================================================================
--- depends/build/defines.mak (revision 507827)
+++ depends/build/defines.mak (working copy)
@@ -30,8 +30,14 @@
DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
SHAREDSUB=..\shared\# ditto
+!IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64"
+WARNING_LEVEL=W0
+!ELSE
+WARNING_LEVEL=WX
+!ENDIF
+
HYCOMMONCFLAGS = \
- -WX -GF -Gs -MD -Zm400 \
+ -$(WARNING_LEVEL) -GF -Gs -MD -Zm400 \
-D_DLL -D_MT -D_WINSOCKAPI_ \
/I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.
Index: make/depends.xml
===================================================================
--- make/depends.xml (revision 507827)
+++ make/depends.xml (working copy)
@@ -53,9 +53,42 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
-
+
-
+
-
+
+
-
+
-
+
+
+
+
+
+
+
Index: make/depends.properties
===================================================================
--- make/depends.properties (revision 507827)
+++ make/depends.properties (working copy)
@@ -46,12 +46,18 @@
bcprov.md5=6141379cf543ba9b24536d281181c6f3
bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk15-134.jar
-msvcr71.dir=${depends.dir}/libs/windows.x86
-msvcr71.dll=${msvcr71.dir}/msvcr71.dll
-#msvcr71.url=${hyenv.SystemRoot}/system32/msvcr71.dll
-msvcr71.url=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
-msvcr71.md5=86f1895ae8c5e8b17d99ece768a70732
+msvcr.dir.x86=${depends.dir}/libs/windows.x86
+msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
+msvcr.dll.file.x86=msvcr71.dll
+msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
+msvcr.md5.x86=86f1895ae8c5e8b17d99ece768a70732
+msvcr.dir.x86_64=${depends.dir}/libs/windows.x86_64
+msvcr.dll.x86_64=${msvcr.dir.x86_64}/msvcr80.dll
+msvcr.dll.file.x86_64=msvcr80.dll
+msvcr.url.x86_64=file:///${hyenv.SystemRoot}/system32/msvcr80.dll
+msvcr.md5.x86_64=465cebd7da2ceaba5e552fc9118a1415
+
icu4j.dir=${depends.jars}/icu4j_3.4.4
icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
icu4j.url=${mirror.base}/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
@@ -109,10 +115,20 @@
servlet-api.md5=c27c02fb0a00cc3a7d05ea993a9bf56e
servlet-api.url=${mirror.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
-people.apache.base=http://people.apache.org/~geirm/harmony/
-awtdeps.dir=${depends.dir}/libs/windows.x86
-awtdeps.tar=${awtdeps.dir}/swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.url=${people.apache.base}swing_awt_deps_winxp_2006-09-28.tgz
-awtdeps.md5=d61a27e4b305d9fcabaaacf34f8f534a
-awtdeps.extract.dir=${depends.dir}/libs/build
-awtdeps.testfile=${awtdeps.extract.dir}/winxp_2006-09-28.txt
+people.apache.base.x86=http://people.apache.org/~geirm/harmony/
+awtdeps.dir.x86=${depends.dir}/libs/windows.x86
+awtdeps.tar.x86=${awtdeps.dir.x86}/swing_awt_deps_winxp_2006-09-28.tgz
+awtdeps.url.x86=${people.apache.base.x86}swing_awt_deps_winxp_2006-09-28.tgz
+awtdeps.md5.x86=d61a27e4b305d9fcabaaacf34f8f534a
+awtdeps.extract.dir.x86=${depends.dir}/libs/build
+awtdeps.testfile.x86=${awtdeps.extract.dir.x86}/winxp_2006-09-28.txt
+
+people.apache.base.x86_64=http://localhost/
+awtdeps.dir.x86_64=${depends.dir}/libs/windows.x86_64
+awtdeps.tar.x86_64=${awtdeps.dir.x86_64}/swing_awt_deps_winxp_2007-02-08.tgz
+awtdeps.url.x86_64=${people.apache.base.x86_64}swing_awt_deps_winxp_2007-02-08.tgz
+awtdeps.md5.x86_64=f2bbb1f4f23100393783fd02a77fcc68
+awtdeps.extract.dir.x86_64=${depends.dir}/libs/build
+awtdeps.testfile.x86_64=${awtdeps.extract.dir.x86_64}/winxp_2007-02-08.txt
+
+
Index: modules/instrument/build.xml
===================================================================
--- modules/instrument/build.xml (revision 507827)
+++ modules/instrument/build.xml (working copy)
@@ -37,7 +37,14 @@
-
+
+
+
+
+
+