erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-12 03:45:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #6065 from keymanapp/chore/windows/nmake-makefile-cleanup

Browse source 
chore(windows): nmake makefile cleanup
This commit is contained in:
Marc Durdin 2021-12-23 10:03:53 +11:00 • committed by GitHub
commit 70becc7ed1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
windows/src/Makefile
View file

@ -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

4
windows/src/buildtools/devtools/Makefile
View file

@ -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

2
windows/src/buildtools/sentrytool/Makefile
View file

@ -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

2
windows/src/engine/keyman32/Makefile
View file

@ -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

2
windows/src/engine/keyman64/Makefile
View file

@ -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"

4
windows/src/engine/tsysinfox64/Makefile
View file

@ -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.

2
windows/src/global/delphi/Makefile
View file

@ -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)