diff --git a/reactos/Makefile b/reactos/Makefile index a7c4a7c47bd..c79c4ca6a78 100644 --- a/reactos/Makefile +++ b/reactos/Makefile @@ -158,7 +158,7 @@ PREAUTO := \ $(ERRCODES_RC) \ $(NCI_SERVICE_FILES) -makefile.auto: $(RMKDIR_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) +makefile.auto: $(RMKDIR_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw diff --git a/reactos/lib/cabinet/cabinet.xml b/reactos/lib/cabinet/cabinet.xml index cd7e758b738..980dc98080f 100644 --- a/reactos/lib/cabinet/cabinet.xml +++ b/reactos/lib/cabinet/cabinet.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/comctl32/comctl32.xml b/reactos/lib/comctl32/comctl32.xml index b331aaa75c2..ea88c05e2c0 100644 --- a/reactos/lib/comctl32/comctl32.xml +++ b/reactos/lib/comctl32/comctl32.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/comdlg32/comdlg32.xml b/reactos/lib/comdlg32/comdlg32.xml index 096c4e72c4c..91c28ccee3c 100644 --- a/reactos/lib/comdlg32/comdlg32.xml +++ b/reactos/lib/comdlg32/comdlg32.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/dbghelp/dbghelp.xml b/reactos/lib/dbghelp/dbghelp.xml index 7e9ee7e9396..6f8666abf57 100644 --- a/reactos/lib/dbghelp/dbghelp.xml +++ b/reactos/lib/dbghelp/dbghelp.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/devenum/devenum.xml b/reactos/lib/devenum/devenum.xml index 20bb50d6026..fd4585c82ae 100644 --- a/reactos/lib/devenum/devenum.xml +++ b/reactos/lib/devenum/devenum.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/dinput/dinput.xml b/reactos/lib/dinput/dinput.xml index ddc3cf3d269..ef408356b31 100644 --- a/reactos/lib/dinput/dinput.xml +++ b/reactos/lib/dinput/dinput.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/dinput8/dinput8.xml b/reactos/lib/dinput8/dinput8.xml index afa2428ff90..f743761c985 100644 --- a/reactos/lib/dinput8/dinput8.xml +++ b/reactos/lib/dinput8/dinput8.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/dxdiagn/dxdiagn.xml b/reactos/lib/dxdiagn/dxdiagn.xml index a68b758a7fa..47714b72ead 100644 --- a/reactos/lib/dxdiagn/dxdiagn.xml +++ b/reactos/lib/dxdiagn/dxdiagn.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/imagehlp/imagehlp.xml b/reactos/lib/imagehlp/imagehlp.xml index 8a046a8c10b..187b7341718 100644 --- a/reactos/lib/imagehlp/imagehlp.xml +++ b/reactos/lib/imagehlp/imagehlp.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/iphlpapi/iphlpapi.xml b/reactos/lib/iphlpapi/iphlpapi.xml index 9ed229e2333..62292a3aa17 100644 --- a/reactos/lib/iphlpapi/iphlpapi.xml +++ b/reactos/lib/iphlpapi/iphlpapi.xml @@ -1,5 +1,4 @@ - winebuild include include/wine diff --git a/reactos/lib/midimap/midimap.xml b/reactos/lib/midimap/midimap.xml index dc451f53f9b..5431c60ea86 100644 --- a/reactos/lib/midimap/midimap.xml +++ b/reactos/lib/midimap/midimap.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/mpr/mpr.xml b/reactos/lib/mpr/mpr.xml index 04a5f27743c..3bbfe20dba3 100644 --- a/reactos/lib/mpr/mpr.xml +++ b/reactos/lib/mpr/mpr.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/msacm/msacm32.xml b/reactos/lib/msacm/msacm32.xml index 89164421cba..751c5d21a9a 100644 --- a/reactos/lib/msacm/msacm32.xml +++ b/reactos/lib/msacm/msacm32.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/netapi32/netapi32.xml b/reactos/lib/netapi32/netapi32.xml index cec71808546..1baad4930d6 100644 --- a/reactos/lib/netapi32/netapi32.xml +++ b/reactos/lib/netapi32/netapi32.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/ole32/ole32.xml b/reactos/lib/ole32/ole32.xml index e4c0e08494f..59db98bb8d2 100644 --- a/reactos/lib/ole32/ole32.xml +++ b/reactos/lib/ole32/ole32.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/oleaut32/oleaut32.xml b/reactos/lib/oleaut32/oleaut32.xml index a3cfd44cf41..e5d6331c100 100644 --- a/reactos/lib/oleaut32/oleaut32.xml +++ b/reactos/lib/oleaut32/oleaut32.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/olepro32/olepro32.xml b/reactos/lib/olepro32/olepro32.xml index d46409e957c..e2b42d4d307 100644 --- a/reactos/lib/olepro32/olepro32.xml +++ b/reactos/lib/olepro32/olepro32.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/richedit/riched32.xml b/reactos/lib/richedit/riched32.xml index 564958be0bf..69a875a3bb7 100644 --- a/reactos/lib/richedit/riched32.xml +++ b/reactos/lib/richedit/riched32.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/rpcrt4/rpcrt4.xml b/reactos/lib/rpcrt4/rpcrt4.xml index 0a190c56fae..f0be6ddc320 100644 --- a/reactos/lib/rpcrt4/rpcrt4.xml +++ b/reactos/lib/rpcrt4/rpcrt4.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/setupapi/setupapi.xml b/reactos/lib/setupapi/setupapi.xml index b96e022458a..ed1cc50ad70 100644 --- a/reactos/lib/setupapi/setupapi.xml +++ b/reactos/lib/setupapi/setupapi.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/shdocvw/shdocvw.xml b/reactos/lib/shdocvw/shdocvw.xml index 31c21d2faf2..0d83e41cf3b 100644 --- a/reactos/lib/shdocvw/shdocvw.xml +++ b/reactos/lib/shdocvw/shdocvw.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/shell32/shell32.xml b/reactos/lib/shell32/shell32.xml index 4e8848a88a2..d1c2ad0a4d2 100644 --- a/reactos/lib/shell32/shell32.xml +++ b/reactos/lib/shell32/shell32.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/shlwapi/shlwapi.xml b/reactos/lib/shlwapi/shlwapi.xml index ca01a3a3d7c..a98c995e48e 100644 --- a/reactos/lib/shlwapi/shlwapi.xml +++ b/reactos/lib/shlwapi/shlwapi.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/urlmon/urlmon.xml b/reactos/lib/urlmon/urlmon.xml index f049e6493ea..6bcc0718dd5 100644 --- a/reactos/lib/urlmon/urlmon.xml +++ b/reactos/lib/urlmon/urlmon.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/lib/version/version.xml b/reactos/lib/version/version.xml index 8481de44098..522b1841ab0 100644 --- a/reactos/lib/version/version.xml +++ b/reactos/lib/version/version.xml @@ -1,5 +1,4 @@ - winebuild include/wine diff --git a/reactos/lib/winmm/winmm.xml b/reactos/lib/winmm/winmm.xml index b8c1ce2c33e..dd44f5d38ce 100644 --- a/reactos/lib/winmm/winmm.xml +++ b/reactos/lib/winmm/winmm.xml @@ -1,5 +1,4 @@ - winebuild . include/wine diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak index 9d2696f3526..c59592c3f5b 100644 --- a/reactos/tools/tools.mak +++ b/reactos/tools/tools.mak @@ -64,6 +64,7 @@ include tools/cdmake/cdmake.mak include tools/nci/nci.mak include tools/rbuild/rbuild.mak include tools/unicode/unicode.mak +include tools/winebuild/winebuild.mak include tools/wmc/wmc.mak include tools/wpp/wpp.mak include tools/wrc/wrc.mak diff --git a/reactos/tools/tools.xml b/reactos/tools/tools.xml index 9ce5163b261..133bb90ca04 100644 --- a/reactos/tools/tools.xml +++ b/reactos/tools/tools.xml @@ -4,6 +4,3 @@ - - - diff --git a/reactos/tools/winebuild/winebuild.mak b/reactos/tools/winebuild/winebuild.mak new file mode 100644 index 00000000000..24bbacb5c51 --- /dev/null +++ b/reactos/tools/winebuild/winebuild.mak @@ -0,0 +1,67 @@ +WINEBUILD_BASE = tools$(SEP)winebuild + +WINEBUILD_BASE_DIR = $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)$(CREATED) + +$(WINEBUILD_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(WINEBUILD_BASE) + +WINEBUILD_TARGET = \ + $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)winebuild$(EXEPOSTFIX) + +WINEBUILD_SOURCES = \ + $(WINEBUILD_BASE)$(SEP)import.c \ + $(WINEBUILD_BASE)$(SEP)main.c \ + $(WINEBUILD_BASE)$(SEP)parser.c \ + $(WINEBUILD_BASE)$(SEP)res16.c \ + $(WINEBUILD_BASE)$(SEP)res32.c \ + $(WINEBUILD_BASE)$(SEP)spec32.c \ + $(WINEBUILD_BASE)$(SEP)utils.c \ + $(WINEBUILD_BASE)$(SEP)mkstemps.c + +WINEBUILD_OBJECTS = \ + $(addprefix $(INTERMEDIATE), $(WINEBUILD_SOURCES:.c=.o)) + +WINEBUILD_HOST_CFLAGS = -D__USE_W32API -Iinclude/wine + +WINEBUILD_HOST_LFLAGS = -g + +$(WINEBUILD_TARGET): $(WINEBUILD_BASE_DIR) $(WINEBUILD_OBJECTS) + $(ECHO_LD) + ${host_gcc} $(WINEBUILD_OBJECTS) $(WINEBUILD_HOST_LFLAGS) -o $(WINEBUILD_TARGET) + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)import.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)import.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)import.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)import.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)main.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)main.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)main.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)main.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)parser.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)parser.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)parser.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)parser.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res16.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)res16.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)res16.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res16.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res32.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)res32.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)res32.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)res32.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)spec32.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)spec32.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)spec32.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)spec32.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)utils.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)utils.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)utils.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)utils.o + +$(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)mkstemps.o: $(WINEBUILD_BASE_DIR) $(WINEBUILD_BASE)$(SEP)mkstemps.c + $(ECHO_CC) + ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $(WINEBUILD_BASE)$(SEP)mkstemps.c -o $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)mkstemps.o + +.PHONY: winebuild_clean +winebuild_clean: + -@$(rm) $(WINEBUILD_TARGET) $(WINEBUILD_OBJECTS) 2>$(NUL) +clean: winebuild_clean diff --git a/reactos/tools/winebuild/winebuild.xml b/reactos/tools/winebuild/winebuild.xml deleted file mode 100644 index daf86598f26..00000000000 --- a/reactos/tools/winebuild/winebuild.xml +++ /dev/null @@ -1,13 +0,0 @@ - - . - include/wine - - import.c - main.c - mkstemps.c - parser.c - res16.c - res32.c - spec32.c - utils.c - diff --git a/reactos/tools/wmc/wmc.mak b/reactos/tools/wmc/wmc.mak index 0743d56fdfe..36091476166 100644 --- a/reactos/tools/wmc/wmc.mak +++ b/reactos/tools/wmc/wmc.mak @@ -6,7 +6,7 @@ $(WMC_BASE_DIR): $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(WMC_BASE) WMC_TARGET = \ - $(ROS_INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX) + $(INTERMEDIATE)$(WMC_BASE)$(SEP)wmc$(EXEPOSTFIX) WMC_SOURCES = \ $(WMC_BASE)$(SEP)getopt.c \