modified the windows build

diff --git a/rlib/build/windows/i386/makefile b/rlib/build/windows/i386/makefile
index 11d46be..18143ef 100644 (file)
--- a/rlib/build/windows/i386/makefile
+++ b/rlib/build/windows/i386/makefile
@@ -25,12 +25,11 @@ NULL=
 NULL=nul
 !ENDIF
 
-
-TARGET=rlib.lib
 PORT=windows
+ARCH=i386
 SRC_DIR=..\..\..
 RPATK_DIR=..\..\..\..
-INCLUDE_DIRS=/I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\i386"
+INCLUDE_DIRS=/I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\$(ARCH)"
 
 
 !IF "$(CFG)" == "release"
@@ -57,107 +56,5 @@ LINK32=lib.exe
 LINK32_FLAGS=/nologo /machine:I386 /out:"$(OUTDIR)\$(TARGET)"
 # LINK32=link.exe
 # LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /machine:I386 /out:"$(OUTDIR)\$(TARGET)" 
-LINK32_OBJS= \
-       "$(OUTDIR)\rref.obj" \
-       "$(OUTDIR)\rcharconv.obj" \
-       "$(OUTDIR)\robject.obj" \
-       "$(OUTDIR)\rgc.obj" \
-       "$(OUTDIR)\rmem.obj" \
-       "$(OUTDIR)\rmath.obj" \
-       "$(OUTDIR)\ratomic.obj" \
-       "$(OUTDIR)\rspinlock.obj" \
-       "$(OUTDIR)\rharray.obj" \
-       "$(OUTDIR)\rcarray.obj" \
-       "$(OUTDIR)\rarray.obj" \
-       "$(OUTDIR)\rhash.obj" \
-       "$(OUTDIR)\rmap.obj" \
-       "$(OUTDIR)\rstring.obj" \
-       "$(OUTDIR)\rlist.obj" \
-       "$(OUTDIR)\rutf.obj" \
-
-
-ALL : "$(OUTDIR)\$(TARGET)"
-
-CLEAN :
-       -@erase "$(OUTDIR)\$(TARGET)"
-       -@erase $(LINK32_OBJS)
-       -@erase *.pdb *.idb *.pch
-       -@rd /S /Q "$(OUTDIR)"
-
-"$(OUTDIR)" :
-       if not exist "$(OUTDIR)\$(NULL)" mkdir "$(OUTDIR)"
-
-
-"$(OUTDIR)\$(TARGET)" : "$(OUTDIR)" $(LINK32_OBJS)
-       $(LINK32) @<<
-       $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-SOURCE="$(SRC_DIR)\rref.c"
-"$(OUTDIR)\rref.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rcharconv.c"
-"$(OUTDIR)\rcharconv.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\robject.c"
-"$(OUTDIR)\robject.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rgc.c"
-"$(OUTDIR)\rgc.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rmem.c"
-"$(OUTDIR)\rmem.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rmath.c"
-"$(OUTDIR)\rmath.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\ratomic.c"
-"$(OUTDIR)\ratomic.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rspinlock.c"
-"$(OUTDIR)\rspinlock.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rharray.c"
-"$(OUTDIR)\rharray.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rcarray.c"
-"$(OUTDIR)\rcarray.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rarray.c"
-"$(OUTDIR)\rarray.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-
-SOURCE="$(SRC_DIR)\rhash.c"
-"$(OUTDIR)\rhash.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-
-SOURCE="$(SRC_DIR)\rmap.c"
-"$(OUTDIR)\rmap.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-
-SOURCE="$(SRC_DIR)\rstring.c"
-"$(OUTDIR)\rstring.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-
-SOURCE="$(SRC_DIR)\rlist.c"
-"$(OUTDIR)\rlist.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rutf.c"
-"$(OUTDIR)\rutf.obj" : $(SOURCE) "$(OUTDIR)"
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
 
+include "..\rlib.mk"

diff --git a/rlib/build/windows/rlib.mk b/rlib/build/windows/rlib.mk
new file mode 100644 (file)
index 0000000..a9153e4
--- /dev/null
+++ b/rlib/build/windows/rlib.mk
@@ -0,0 +1,105 @@
+TARGET=rlib.lib\r
+LINK32_OBJS= \\r
+       "$(OUTDIR)\rref.obj" \\r
+       "$(OUTDIR)\rcharconv.obj" \\r
+       "$(OUTDIR)\robject.obj" \\r
+       "$(OUTDIR)\rgc.obj" \\r
+       "$(OUTDIR)\rmem.obj" \\r
+       "$(OUTDIR)\rmath.obj" \\r
+       "$(OUTDIR)\ratomic.obj" \\r
+       "$(OUTDIR)\rspinlock.obj" \\r
+       "$(OUTDIR)\rharray.obj" \\r
+       "$(OUTDIR)\rcarray.obj" \\r
+       "$(OUTDIR)\rarray.obj" \\r
+       "$(OUTDIR)\rhash.obj" \\r
+       "$(OUTDIR)\rmap.obj" \\r
+       "$(OUTDIR)\rstring.obj" \\r
+       "$(OUTDIR)\rlist.obj" \\r
+       "$(OUTDIR)\rutf.obj" \\r
+\r
+\r
+ALL : "$(OUTDIR)\$(TARGET)"\r
+\r
+CLEAN :\r
+       -@erase "$(OUTDIR)\$(TARGET)"\r
+       -@erase $(LINK32_OBJS)\r
+       -@erase *.pdb *.idb *.pch\r
+       -@rd /S /Q "$(OUTDIR)"\r
+\r
+"$(OUTDIR)" :\r
+       if not exist "$(OUTDIR)\$(NULL)" mkdir "$(OUTDIR)"\r
+\r
+\r
+"$(OUTDIR)\$(TARGET)" : "$(OUTDIR)" $(LINK32_OBJS)\r
+       $(LINK32) @<<\r
+       $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+SOURCE="$(SRC_DIR)\rref.c"\r
+"$(OUTDIR)\rref.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rcharconv.c"\r
+"$(OUTDIR)\rcharconv.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\robject.c"\r
+"$(OUTDIR)\robject.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rgc.c"\r
+"$(OUTDIR)\rgc.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rmem.c"\r
+"$(OUTDIR)\rmem.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rmath.c"\r
+"$(OUTDIR)\rmath.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\ratomic.c"\r
+"$(OUTDIR)\ratomic.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rspinlock.c"\r
+"$(OUTDIR)\rspinlock.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rharray.c"\r
+"$(OUTDIR)\rharray.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rcarray.c"\r
+"$(OUTDIR)\rcarray.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rarray.c"\r
+"$(OUTDIR)\rarray.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+\r
+SOURCE="$(SRC_DIR)\rhash.c"\r
+"$(OUTDIR)\rhash.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+\r
+SOURCE="$(SRC_DIR)\rmap.c"\r
+"$(OUTDIR)\rmap.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+\r
+SOURCE="$(SRC_DIR)\rstring.c"\r
+"$(OUTDIR)\rstring.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+\r
+SOURCE="$(SRC_DIR)\rlist.c"\r
+"$(OUTDIR)\rlist.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rutf.c"\r
+"$(OUTDIR)\rutf.obj" : $(SOURCE) "$(OUTDIR)"\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r

diff --git a/rpa/build/windows/i386/makefile b/rpa/build/windows/i386/makefile
index fdc5595..fb507ff 100644 (file)
--- a/rpa/build/windows/i386/makefile
+++ b/rpa/build/windows/i386/makefile
@@ -25,12 +25,11 @@ NULL=
 NULL=nul
 !ENDIF
 
-
-TARGET=rpa.lib
 PORT=windows
+ARCH=i386
 SRC_DIR=..\..\..
 RPATK_DIR=..\..\..\..
-INCLUDE_DIRS=/I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\i386"
+INCLUDE_DIRS=/I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\$(ARCH)"
 
 
 !IF "$(CFG)" == "release"
@@ -57,62 +56,5 @@ LINK32=lib.exe
 LINK32_FLAGS=/nologo /machine:I386 /out:"$(OUTDIR)\$(TARGET)"
 # LINK32=link.exe
 # LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /machine:I386 /out:"$(OUTDIR)\$(TARGET)" 
-LINK32_OBJS= \
-       "$(OUTDIR)\rpacache.obj" \
-       "$(OUTDIR)\rpadbex.obj" \
-       "$(OUTDIR)\rpastat.obj" \
-       "$(OUTDIR)\rparecord.obj" \
-       "$(OUTDIR)\rpavm.obj" \
-       "$(OUTDIR)\rpacompiler.obj" \
-       "$(OUTDIR)\rpaparser.obj" \
-       "$(OUTDIR)\rpaoptimization.obj" \
-
-
-ALL : "$(OUTDIR)\$(TARGET)"
-
-CLEAN :
-       -@erase "$(OUTDIR)\$(TARGET)"
-       -@erase $(LINK32_OBJS)
-       -@erase *.pdb *.idb *.pch
-       -@rd /S /Q "$(OUTDIR)"
-
-"$(OUTDIR)" :
-       if not exist "$(OUTDIR)\$(NULL)" mkdir "$(OUTDIR)"
-
-
-"$(OUTDIR)\$(TARGET)" : "$(OUTDIR)" $(LINK32_OBJS)
-       $(LINK32) @<<
-       $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-SOURCE="$(SRC_DIR)\rpacache.c"
-"$(OUTDIR)\rpacache.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rpadbex.c"
-"$(OUTDIR)\rpadbex.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rpastat.c"
-"$(OUTDIR)\rpastat.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rparecord.c"
-"$(OUTDIR)\rparecord.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rpavm.c"
-"$(OUTDIR)\rpavm.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rpacompiler.c"
-"$(OUTDIR)\rpacompiler.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rpaparser.c"
-"$(OUTDIR)\rpaparser.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
 
-SOURCE="$(SRC_DIR)\rpaoptimization.c"
-"$(OUTDIR)\rpaoptimization.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
+include "..\rpa.mk"

diff --git a/rpa/build/windows/rpa.mk b/rpa/build/windows/rpa.mk
new file mode 100644 (file)
index 0000000..979e357
--- /dev/null
+++ b/rpa/build/windows/rpa.mk
@@ -0,0 +1,60 @@
+TARGET=rpa.lib\r
+LINK32_OBJS= \\r
+       "$(OUTDIR)\rpacache.obj" \\r
+       "$(OUTDIR)\rpadbex.obj" \\r
+       "$(OUTDIR)\rpastat.obj" \\r
+       "$(OUTDIR)\rparecord.obj" \\r
+       "$(OUTDIR)\rpavm.obj" \\r
+       "$(OUTDIR)\rpacompiler.obj" \\r
+       "$(OUTDIR)\rpaparser.obj" \\r
+       "$(OUTDIR)\rpaoptimization.obj" \\r
+\r
+\r
+ALL : "$(OUTDIR)\$(TARGET)"\r
+\r
+CLEAN :\r
+       -@erase "$(OUTDIR)\$(TARGET)"\r
+       -@erase $(LINK32_OBJS)\r
+       -@erase *.pdb *.idb *.pch\r
+       -@rd /S /Q "$(OUTDIR)"\r
+\r
+"$(OUTDIR)" :\r
+       if not exist "$(OUTDIR)\$(NULL)" mkdir "$(OUTDIR)"\r
+\r
+\r
+"$(OUTDIR)\$(TARGET)" : "$(OUTDIR)" $(LINK32_OBJS)\r
+       $(LINK32) @<<\r
+       $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+SOURCE="$(SRC_DIR)\rpacache.c"\r
+"$(OUTDIR)\rpacache.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rpadbex.c"\r
+"$(OUTDIR)\rpadbex.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rpastat.c"\r
+"$(OUTDIR)\rpastat.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rparecord.c"\r
+"$(OUTDIR)\rparecord.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rpavm.c"\r
+"$(OUTDIR)\rpavm.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rpacompiler.c"\r
+"$(OUTDIR)\rpacompiler.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rpaparser.c"\r
+"$(OUTDIR)\rpaparser.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rpaoptimization.c"\r
+"$(OUTDIR)\rpaoptimization.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r

diff --git a/rvm/build/windows/i386/makefile b/rvm/build/windows/i386/makefile
index 1b99aab..1dd881a 100644 (file)
--- a/rvm/build/windows/i386/makefile
+++ b/rvm/build/windows/i386/makefile
@@ -26,11 +26,11 @@ NULL=nul
 !ENDIF
 
 
-TARGET=rvm.lib
 PORT=windows
+ARCH=i386
 SRC_DIR=..\..\..
 RPATK_DIR=..\..\..\..
-INCLUDE_DIRS=/I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\i386"
+INCLUDE_DIRS=/I"$(RPATK_DIR)" /I"$(RPATK_DIR)\arch\$(PORT)\$(ARCH)"
 
 
 !IF "$(CFG)" == "release"
@@ -57,188 +57,5 @@ LINK32=lib.exe
 LINK32_FLAGS=/nologo /machine:I386 /out:"$(OUTDIR)\$(TARGET)"
 # LINK32=link.exe
 # LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib /nologo /subsystem:console /incremental:no /machine:I386 /out:"$(OUTDIR)\$(TARGET)" 
-LINK32_OBJS= \
-       "$(OUTDIR)\rvmoperator.obj" \
-       "$(OUTDIR)\rvmcodemap.obj" \
-       "$(OUTDIR)\rvmrelocmap.obj" \
-       "$(OUTDIR)\rvmcodegen.obj" \
-       "$(OUTDIR)\rvmreg.obj" \
-       "$(OUTDIR)\rvmscope.obj" \
-       "$(OUTDIR)\rvmoperatorbin.obj" \
-       "$(OUTDIR)\rvmoperatoradd.obj" \
-       "$(OUTDIR)\rvmoperatorand.obj" \
-       "$(OUTDIR)\rvmoperatoreq.obj" \
-       "$(OUTDIR)\rvmoperatornoteq.obj" \
-       "$(OUTDIR)\rvmoperatorlogicor.obj" \
-       "$(OUTDIR)\rvmoperatorlogicand.obj" \
-       "$(OUTDIR)\rvmoperatorlogicnot.obj" \
-       "$(OUTDIR)\rvmoperatorless.obj" \
-       "$(OUTDIR)\rvmoperatorlesseq.obj" \
-       "$(OUTDIR)\rvmoperatorgreater.obj" \
-       "$(OUTDIR)\rvmoperatorgreatereq.obj" \
-       "$(OUTDIR)\rvmoperatorxor.obj" \
-       "$(OUTDIR)\rvmoperatoror.obj" \
-       "$(OUTDIR)\rvmoperatorcmp.obj" \
-       "$(OUTDIR)\rvmoperatorcmn.obj" \
-       "$(OUTDIR)\rvmoperatorlsl.obj" \
-       "$(OUTDIR)\rvmoperatorlsr.obj" \
-       "$(OUTDIR)\rvmoperatorlsru.obj" \
-       "$(OUTDIR)\rvmoperatorcast.obj" \
-       "$(OUTDIR)\rvmoperatorcat.obj" \
-       "$(OUTDIR)\rvmoperatorsub.obj" \
-       "$(OUTDIR)\rvmoperatormul.obj" \
-       "$(OUTDIR)\rvmoperatordiv.obj" \
-       "$(OUTDIR)\rvmoperatormod.obj" \
-       "$(OUTDIR)\rvmoperatornot.obj" \
-       "$(OUTDIR)\rvmcpu.obj" \
-
-
-ALL : "$(OUTDIR)\$(TARGET)"
-
-CLEAN :
-       -@erase "$(OUTDIR)\$(TARGET)"
-       -@erase $(LINK32_OBJS)
-       -@erase *.pdb *.idb *.pch
-       -@rd /S /Q "$(OUTDIR)"
-
-"$(OUTDIR)" :
-       if not exist "$(OUTDIR)\$(NULL)" mkdir "$(OUTDIR)"
-
-
-"$(OUTDIR)\$(TARGET)" : "$(OUTDIR)" $(LINK32_OBJS)
-       $(LINK32) @<<
-       $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-SOURCE="$(SRC_DIR)\rvmcpu.c"
-"$(OUTDIR)\rvmcpu.obj" : $(SOURCE) $(OUTDIR)
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperator.c"
-"$(OUTDIR)\rvmoperator.obj" : $(SOURCE) $(OUTDIR)
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmcodemap.c"
-"$(OUTDIR)\rvmcodemap.obj" : $(SOURCE) $(OUTDIR)
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmrelocmap.c"
-"$(OUTDIR)\rvmrelocmap.obj" : $(SOURCE) $(OUTDIR)
-       $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmcodegen.c"
-"$(OUTDIR)\rvmcodegen.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmreg.c"
-"$(OUTDIR)\rvmreg.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmscope.c"
-"$(OUTDIR)\rvmscope.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorbin.c"
-"$(OUTDIR)\rvmoperatorbin.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatoradd.c"
-"$(OUTDIR)\rvmoperatoradd.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorand.c"
-"$(OUTDIR)\rvmoperatorand.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatoreq.c"
-"$(OUTDIR)\rvmoperatoreq.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatornoteq.c"
-"$(OUTDIR)\rvmoperatornoteq.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorlogicor.c"
-"$(OUTDIR)\rvmoperatorlogicor.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorlogicand.c"
-"$(OUTDIR)\rvmoperatorlogicand.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorlogicnot.c"
-"$(OUTDIR)\rvmoperatorlogicnot.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorless.c"
-"$(OUTDIR)\rvmoperatorless.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorlesseq.c"
-"$(OUTDIR)\rvmoperatorlesseq.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorgreater.c"
-"$(OUTDIR)\rvmoperatorgreater.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorgreatereq.c"
-"$(OUTDIR)\rvmoperatorgreatereq.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorxor.c"
-"$(OUTDIR)\rvmoperatorxor.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatoror.c"
-"$(OUTDIR)\rvmoperatoror.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorcmp.c"
-"$(OUTDIR)\rvmoperatorcmp.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorcmn.c"
-"$(OUTDIR)\rvmoperatorcmn.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorlsl.c"
-"$(OUTDIR)\rvmoperatorlsl.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorlsr.c"
-"$(OUTDIR)\rvmoperatorlsr.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorlsru.c"
-"$(OUTDIR)\rvmoperatorlsru.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorcast.c"
-"$(OUTDIR)\rvmoperatorcast.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorcat.c"
-"$(OUTDIR)\rvmoperatorcat.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatorsub.c"
-"$(OUTDIR)\rvmoperatorsub.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatormul.c"
-"$(OUTDIR)\rvmoperatormul.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatordiv.c"
-"$(OUTDIR)\rvmoperatordiv.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatormod.c"
-"$(OUTDIR)\rvmoperatormod.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
-
-SOURCE="$(SRC_DIR)\rvmoperatornot.c"
-"$(OUTDIR)\rvmoperatornot.obj" : $(SOURCE) $(OUTDIR)
-    $(CPP) $(CPP_FLAGS) $(SOURCE)
 
+include "..\rvm.mk"

diff --git a/rvm/build/windows/rvm.mk b/rvm/build/windows/rvm.mk
new file mode 100644 (file)
index 0000000..3ecaaff
--- /dev/null
+++ b/rvm/build/windows/rvm.mk
@@ -0,0 +1,186 @@
+TARGET=rvm.lib\r
+LINK32_OBJS= \\r
+       "$(OUTDIR)\rvmoperator.obj" \\r
+       "$(OUTDIR)\rvmcodemap.obj" \\r
+       "$(OUTDIR)\rvmrelocmap.obj" \\r
+       "$(OUTDIR)\rvmcodegen.obj" \\r
+       "$(OUTDIR)\rvmreg.obj" \\r
+       "$(OUTDIR)\rvmscope.obj" \\r
+       "$(OUTDIR)\rvmoperatorbin.obj" \\r
+       "$(OUTDIR)\rvmoperatoradd.obj" \\r
+       "$(OUTDIR)\rvmoperatorand.obj" \\r
+       "$(OUTDIR)\rvmoperatoreq.obj" \\r
+       "$(OUTDIR)\rvmoperatornoteq.obj" \\r
+       "$(OUTDIR)\rvmoperatorlogicor.obj" \\r
+       "$(OUTDIR)\rvmoperatorlogicand.obj" \\r
+       "$(OUTDIR)\rvmoperatorlogicnot.obj" \\r
+       "$(OUTDIR)\rvmoperatorless.obj" \\r
+       "$(OUTDIR)\rvmoperatorlesseq.obj" \\r
+       "$(OUTDIR)\rvmoperatorgreater.obj" \\r
+       "$(OUTDIR)\rvmoperatorgreatereq.obj" \\r
+       "$(OUTDIR)\rvmoperatorxor.obj" \\r
+       "$(OUTDIR)\rvmoperatoror.obj" \\r
+       "$(OUTDIR)\rvmoperatorcmp.obj" \\r
+       "$(OUTDIR)\rvmoperatorcmn.obj" \\r
+       "$(OUTDIR)\rvmoperatorlsl.obj" \\r
+       "$(OUTDIR)\rvmoperatorlsr.obj" \\r
+       "$(OUTDIR)\rvmoperatorlsru.obj" \\r
+       "$(OUTDIR)\rvmoperatorcast.obj" \\r
+       "$(OUTDIR)\rvmoperatorcat.obj" \\r
+       "$(OUTDIR)\rvmoperatorsub.obj" \\r
+       "$(OUTDIR)\rvmoperatormul.obj" \\r
+       "$(OUTDIR)\rvmoperatordiv.obj" \\r
+       "$(OUTDIR)\rvmoperatormod.obj" \\r
+       "$(OUTDIR)\rvmoperatornot.obj" \\r
+       "$(OUTDIR)\rvmcpu.obj" \\r
+\r
+\r
+ALL : "$(OUTDIR)\$(TARGET)"\r
+\r
+CLEAN :\r
+       -@erase "$(OUTDIR)\$(TARGET)"\r
+       -@erase $(LINK32_OBJS)\r
+       -@erase *.pdb *.idb *.pch\r
+       -@rd /S /Q "$(OUTDIR)"\r
+\r
+"$(OUTDIR)" :\r
+       if not exist "$(OUTDIR)\$(NULL)" mkdir "$(OUTDIR)"\r
+\r
+\r
+"$(OUTDIR)\$(TARGET)" : "$(OUTDIR)" $(LINK32_OBJS)\r
+       $(LINK32) @<<\r
+       $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+SOURCE="$(SRC_DIR)\rvmcpu.c"\r
+"$(OUTDIR)\rvmcpu.obj" : $(SOURCE) $(OUTDIR)\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperator.c"\r
+"$(OUTDIR)\rvmoperator.obj" : $(SOURCE) $(OUTDIR)\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmcodemap.c"\r
+"$(OUTDIR)\rvmcodemap.obj" : $(SOURCE) $(OUTDIR)\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmrelocmap.c"\r
+"$(OUTDIR)\rvmrelocmap.obj" : $(SOURCE) $(OUTDIR)\r
+       $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmcodegen.c"\r
+"$(OUTDIR)\rvmcodegen.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmreg.c"\r
+"$(OUTDIR)\rvmreg.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmscope.c"\r
+"$(OUTDIR)\rvmscope.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorbin.c"\r
+"$(OUTDIR)\rvmoperatorbin.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatoradd.c"\r
+"$(OUTDIR)\rvmoperatoradd.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorand.c"\r
+"$(OUTDIR)\rvmoperatorand.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatoreq.c"\r
+"$(OUTDIR)\rvmoperatoreq.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatornoteq.c"\r
+"$(OUTDIR)\rvmoperatornoteq.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorlogicor.c"\r
+"$(OUTDIR)\rvmoperatorlogicor.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorlogicand.c"\r
+"$(OUTDIR)\rvmoperatorlogicand.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorlogicnot.c"\r
+"$(OUTDIR)\rvmoperatorlogicnot.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorless.c"\r
+"$(OUTDIR)\rvmoperatorless.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorlesseq.c"\r
+"$(OUTDIR)\rvmoperatorlesseq.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorgreater.c"\r
+"$(OUTDIR)\rvmoperatorgreater.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorgreatereq.c"\r
+"$(OUTDIR)\rvmoperatorgreatereq.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorxor.c"\r
+"$(OUTDIR)\rvmoperatorxor.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatoror.c"\r
+"$(OUTDIR)\rvmoperatoror.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorcmp.c"\r
+"$(OUTDIR)\rvmoperatorcmp.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorcmn.c"\r
+"$(OUTDIR)\rvmoperatorcmn.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorlsl.c"\r
+"$(OUTDIR)\rvmoperatorlsl.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorlsr.c"\r
+"$(OUTDIR)\rvmoperatorlsr.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorlsru.c"\r
+"$(OUTDIR)\rvmoperatorlsru.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorcast.c"\r
+"$(OUTDIR)\rvmoperatorcast.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorcat.c"\r
+"$(OUTDIR)\rvmoperatorcat.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatorsub.c"\r
+"$(OUTDIR)\rvmoperatorsub.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatormul.c"\r
+"$(OUTDIR)\rvmoperatormul.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatordiv.c"\r
+"$(OUTDIR)\rvmoperatordiv.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatormod.c"\r
+"$(OUTDIR)\rvmoperatormod.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r
+SOURCE="$(SRC_DIR)\rvmoperatornot.c"\r
+"$(OUTDIR)\rvmoperatornot.obj" : $(SOURCE) $(OUTDIR)\r
+    $(CPP) $(CPP_FLAGS) $(SOURCE)\r
+\r