diff --git a/windows/src/Makefile b/windows/src/Makefile index 482f913c51..710211d112 100644 --- a/windows/src/Makefile +++ b/windows/src/Makefile @@ -105,7 +105,7 @@ release: clean-pathdefines test-release-cef-path test-releasebuildcheck test-uia cd $(ROOT)\src $(MAKE) global-versions $(MAKE) build-release-wrapper -# $(MAKE) clean <-- this makes it harder to do OEM builds +# $(MAKE) clean <-- this makes it harder to do OEM builds cd $(ROOT)\src clean-pathdefines: test-releasebuildcheck diff --git a/windows/src/buildtools/devtools/Makefile b/windows/src/buildtools/devtools/Makefile index 50ec261e60..105fa201ac 100644 --- a/windows/src/buildtools/devtools/Makefile +++ b/windows/src/buildtools/devtools/Makefile @@ -16,9 +16,9 @@ EXCLUDEPATHDEFINES=1 build: dirs # build with DCC32PATH as $DCC32 command uses devtools.exe... -# $(DCC32) devtools.dpr +# $(DCC32) devtools.dpr $(DELPHI_MSBUILD) devtools.dproj -#"$(DCC32PATH)\dcc32.exe" -Q -B -E. -NSVcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Web;Soap;Winapi;System.Win devtools.dpr +# "$(DCC32PATH)\dcc32.exe" -Q -B -E. -NSVcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Web;Soap;Winapi;System.Win devtools.dpr $(COPY) $(WIN32_TARGET_PATH)\devtools.exe $(PROGRAM)\buildtools test-releasebuildcheck: build diff --git a/windows/src/buildtools/sentrytool/Makefile b/windows/src/buildtools/sentrytool/Makefile index 4b51e2f46f..222d4a81df 100644 --- a/windows/src/buildtools/sentrytool/Makefile +++ b/windows/src/buildtools/sentrytool/Makefile @@ -6,7 +6,7 @@ build: dirs # build with DCC32PATH as $DCC32 command uses devtools.exe... -# $(DCC32) devtools.dpr +# $(DCC32) devtools.dpr $(DELPHI_MSBUILD) sentrytool.dproj "/p:Platform=Win32" $(COPY) $(WIN32_TARGET_PATH)\sentrytool.exe $(PROGRAM)\buildtools diff --git a/windows/src/engine/keyman32/Makefile b/windows/src/engine/keyman32/Makefile index 8871012a01..7f87730bee 100644 --- a/windows/src/engine/keyman32/Makefile +++ b/windows/src/engine/keyman32/Makefile @@ -8,7 +8,7 @@ build: version.res dirs pull-core $(MSBUILD) keyman32.vcxproj $(MSBUILD_BUILD) $(COPY) $(WIN32_TARGET_PATH)\keyman32.dll $(PROGRAM)\engine $(COPY) $(WIN32_TARGET_PATH)\keyman32.pdb $(DEBUGPATH)\engine -#$(COPY) $(WIN32_TARGET_PATH)\keyman32.lib $(OUTLIB) done by vcxproj +# $(COPY) $(WIN32_TARGET_PATH)\keyman32.lib $(OUTLIB) done by vcxproj clean: def-clean $(MSBUILD) $(MSBUILD_CLEAN) keyman32.vcxproj diff --git a/windows/src/engine/keyman64/Makefile b/windows/src/engine/keyman64/Makefile index dc12d80bfb..6715191ee8 100644 --- a/windows/src/engine/keyman64/Makefile +++ b/windows/src/engine/keyman64/Makefile @@ -8,7 +8,7 @@ build: version.res dirs $(MSBUILD) keyman64.sln $(MSBUILD_BUILD) "/p:Platform=x64" $(COPY) $(X64_TARGET_PATH)\keyman64.dll $(PROGRAM)\engine $(COPY) $(X64_TARGET_PATH)\keyman64.pdb $(DEBUGPATH)\engine -# $(COPY) keyman64.lib $(OUTLIB) - already done +# $(COPY) keyman64.lib $(OUTLIB) - already done clean: def-clean $(MSBUILD) keyman64.sln $(MSBUILD_CLEAN) "/p:Platform=x64" diff --git a/windows/src/engine/tsysinfox64/Makefile b/windows/src/engine/tsysinfox64/Makefile index e18cd65968..d1f40581f8 100644 --- a/windows/src/engine/tsysinfox64/Makefile +++ b/windows/src/engine/tsysinfox64/Makefile @@ -6,7 +6,7 @@ build: version.res manifest.res dirs $(DELPHI_MSBUILD) tsysinfox64.dproj "/p:Platform=Win64" -#$(SENTRYTOOL_DELPHIPREP) $(WIN64_TARGET_PATH)\tsysinfox64.exe -dpr tsysinfox64.dpr +# $(SENTRYTOOL_DELPHIPREP) $(WIN64_TARGET_PATH)\tsysinfox64.exe -dpr tsysinfox64.dpr $(COPY) $(WIN64_TARGET_PATH)\tsysinfox64.exe $(PROGRAM)\engine clean: def-clean @@ -16,7 +16,7 @@ signcode: wrap-symbols: $(SYMSTORE) $(PROGRAM)\engine\tsysinfox64.exe /t keyman-engine-windows -#$(SYMSTORE) $(DEBUGPATH)\engine\tsysinfox64.dbg /t keyman-engine-windows +# $(SYMSTORE) $(DEBUGPATH)\engine\tsysinfox64.dbg /t keyman-engine-windows install: echo Nothing to do. diff --git a/windows/src/global/delphi/Makefile b/windows/src/global/delphi/Makefile index 3e3743afce..559eaf12de 100644 --- a/windows/src/global/delphi/Makefile +++ b/windows/src/global/delphi/Makefile @@ -13,7 +13,7 @@ build: keyman-components # ---------------------------------------------------------------------- keyman-components: dirs compile install -# $(COPY) keyman_components.bpl $(OUTLIB) +# $(COPY) keyman_components.bpl $(OUTLIB) compile: @-mkdir obj\Win32\$(TARGET_PATH)