From c1e981944647317392b9cda17a59902ef12fd18f Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 30 Mar 2016 15:09:59 +0200 Subject: [PATCH] MSIBuildCfg.mak moved --- MSI/MSIBuild | 2 +- MSI/MSICA | 2 +- MSI/ZRCola/Main/Makefile | 34 +++++++++++------------ MSI/ZRCola/Makefile | 2 +- Makefile | 2 +- Updater | 2 +- ZRCola/MSIBuild/Makefile | 20 ++++++------- {MSI/include => include}/MSIBuildCfg.mak | Bin 12518 -> 12534 bytes lib/MSICALib | 2 +- lib/libZRCola/MSIBuild/Makefile | 10 +++---- lib/libZRColaUI/MSIBuild/Makefile | 10 +++---- lib/wxExtend | 2 +- 12 files changed, 44 insertions(+), 44 deletions(-) rename {MSI/include => include}/MSIBuildCfg.mak (97%) diff --git a/MSI/MSIBuild b/MSI/MSIBuild index f56e757..fb4d0c3 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit f56e7574d9f5f6cd2cf604a9b292e3f5c0fe9628 +Subproject commit fb4d0c31c50300818338fcfb8d9d52dff9f8b53b diff --git a/MSI/MSICA b/MSI/MSICA index 7bdcc73..ca828f6 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit 7bdcc73f530034754ade893e4215dbed744a039a +Subproject commit ca828f691eb77104c5e0fa2dc4b0346d303b6ab8 diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 692ac0f..61e09a8 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -17,7 +17,7 @@ # along with ZRCola. If not, see . # -!INCLUDE "..\..\include\MSIBuildCfg.mak" +!INCLUDE "..\..\..\include\MSIBuildCfg.mak" MSIBUILD_IS_LOCALIZEABLE=1 @@ -29,7 +29,7 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Binary-1.idt" \ "$(LANG).$(PLAT).$(CFG).Binary-1\UIHeader.bmp" -"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1" +"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1" -if exist $@ del /f /q $@ move /y << $@ > NUL Name Data @@ -47,7 +47,7 @@ binUIHeader.bmp UIHeader.bmp All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt" -"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Component ComponentId Directory_ Attributes Condition KeyPath @@ -70,7 +70,7 @@ comp00_ZRCola_BI.ttf {883DDA9A-DA85-4FC4-95B7-EF0E08766DEF} FontsFolder 0 file0 All :: "$(LANG).$(PLAT).$(CFG).Control-2.idt" -"En.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"En.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help @@ -97,7 +97,7 @@ dlgLicenseAgreement ctlAgreementText ScrollableText 15 60 370 195 7 {\rtf1\adef All :: "$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" -"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Type Source Target @@ -115,7 +115,7 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Directory-1.idt" \ "$(LANG).$(PLAT).$(CFG).Directory-2.idt" -"$(LANG).$(PLAT).$(CFG).Directory-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Directory-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Directory Directory_Parent DefaultDir @@ -147,7 +147,7 @@ ZRCOLALOCSLSIDIR ZRCOLALOCDIR sl_SI ZRCOLADATADIR ZRCOLADIR data < NUL Directory Directory_Parent DefaultDir @@ -174,7 +174,7 @@ ZRCOLADIR PROGRAMFILESDIR ZRCola:. All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt" -"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Feature Feature_Parent Title Description Display Level Directory_ Attributes @@ -202,7 +202,7 @@ featZRColaFonts00 featZRColaFonts 00 ZRCola Times New Roman based font 1 1 ZRCOL All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" -"$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Feature_ Component_ @@ -220,7 +220,7 @@ featZRColaFonts00 comp00_ZRCola_BI.ttf All :: "$(LANG).$(PLAT).$(CFG).File-1.idt" -"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL File Component_ FileName FileSize Version Language Attributes Sequence @@ -240,7 +240,7 @@ file00_ZRCola_BI.ttf comp00_ZRCola_BI.ttf 00_ZRC~4.TTF|00_ZRCola_BI.ttf 0 0 1 All :: "$(LANG).$(PLAT).$(CFG).Font-1.idt" -"$(LANG).$(PLAT).$(CFG).Font-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Font-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL File_ FontTitle @@ -258,7 +258,7 @@ file00_ZRCola_BI.ttf All :: "$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" -"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -274,7 +274,7 @@ caSetZRCOLADIR2 INSTALLDIR AND UILevel < 4 1002 All :: "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" -"$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -290,7 +290,7 @@ caSetZRCOLADIR2 INSTALLDIR 1002 All :: "$(LANG).$(PLAT).$(CFG).Media-1.idt" -"$(LANG).$(PLAT).$(CFG).Media-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Media-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL DiskId LastSequence DiskPrompt Cabinet VolumeLabel Source @@ -305,7 +305,7 @@ Media DiskId All :: "$(LANG).$(PLAT).$(CFG).Property-1.idt" -"$(LANG).$(PLAT).$(CFG).Property-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Property-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Value @@ -326,7 +326,7 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Registry-1.idt" \ "$(LANG).$(PLAT).$(CFG).Registry-2.idt" -"$(LANG).$(PLAT).$(CFG).Registry-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Registry-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Registry Root Key Name Value Component_ @@ -336,7 +336,7 @@ regLocalizationRepositoryPath 2 SOFTWARE\Amebis\ZRCola LocalizationRepositoryPat regDatabasePath 2 SOFTWARE\Amebis\ZRCola DatabasePath [ZRCOLADATADIR] compDatabasePath < NUL Registry Root Key Name Value Component_ diff --git a/MSI/ZRCola/Makefile b/MSI/ZRCola/Makefile index 84c48ef..c077d14 100644 --- a/MSI/ZRCola/Makefile +++ b/MSI/ZRCola/Makefile @@ -17,5 +17,5 @@ # along with ZRCola. If not, see . # -!INCLUDE "..\include\MSIBuildCfg.mak" +!INCLUDE "..\..\include\MSIBuildCfg.mak" !INCLUDE "..\MSIBuild\Makefile" diff --git a/Makefile b/Makefile index 7c533ae..9149dec 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ GenRSAKeypair :: "MSI\MSIBuild\Version\Version.mak" ###################################################################### !INCLUDE "MSI\MSIBuild\Version\Version.mak" -!INCLUDE "MSI\include\MSIBuildCfg.mak" +!INCLUDE "include\MSIBuildCfg.mak" ###################################################################### diff --git a/Updater b/Updater index 28b00d3..e8a0d13 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 28b00d37dc89119ff92a3e9cdb83b38a7b53a332 +Subproject commit e8a0d13541ac87037e0f0aa1df7b67e84b899d69 diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile index 25edb1b..75df6d0 100644 --- a/ZRCola/MSIBuild/Makefile +++ b/ZRCola/MSIBuild/Makefile @@ -17,7 +17,7 @@ # along with ZRCola. If not, see . # -!INCLUDE "..\..\MSI\include\MSIBuildCfg.mak" +!INCLUDE "..\..\include\MSIBuildCfg.mak" MSIBUILD_IS_LOCALIZEABLE=1 @@ -27,7 +27,7 @@ MSIBUILD_IS_LOCALIZEABLE=1 All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" -"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Signature_ @@ -42,7 +42,7 @@ OLDZRCOLADIR clZRCola.exe.$(PLAT) All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" -"$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Signature_ ComponentId Type @@ -62,7 +62,7 @@ clZRCola.exe.x64 {D45B105D-2303-459A-AF4B-52AC3AAD5510} 1 All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt" -"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Component ComponentId Directory_ Attributes Condition KeyPath @@ -83,7 +83,7 @@ compZRCola.mo.sl_SI {7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63} ZRCOLALOCSLSIDIR $(MS All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt" -"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" +"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Feature Feature_Parent Title Description Display Level Directory_ Attributes @@ -110,7 +110,7 @@ featZRCola ZRCola Input system for linguistic use 1 1 ZRCOLADIR 8 All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" -"$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Feature_ Component_ @@ -136,7 +136,7 @@ featZRCola comp00_ZRCola_Re.ttf All :: "$(LANG).$(PLAT).$(CFG).File-1.idt" -"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL File Component_ FileName FileSize Version Language Attributes Sequence @@ -154,7 +154,7 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Icon-1.idt" \ "$(LANG).$(PLAT).$(CFG).Icon-1\ZRCola.ico" -"$(LANG).$(PLAT).$(CFG).Icon-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Icon-1" +"$(LANG).$(PLAT).$(CFG).Icon-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Icon-1" -if exist $@ del /f /q $@ move /y << $@ > NUL Name Data @@ -172,7 +172,7 @@ iconZRCola.ico ZRCola.ico All :: "$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" -"$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL FileKey Component_ FileName DirProperty InstallMode @@ -187,7 +187,7 @@ rmfiZRCola compZRCola.exe.$(PLAT) ZRColaShortcutDir 2 All :: "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" -"En.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" +"En.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir diff --git a/MSI/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak similarity index 97% rename from MSI/include/MSIBuildCfg.mak rename to include/MSIBuildCfg.mak index 5a1f4c4aa83ccb2a1dc02e7a81e94d037dd197bd..59e32c409cf3f965675f5f355aa3f8af4251aa0e 100644 GIT binary patch delta 63 zcmaEs_$_fmnjkAL0~dqxWIh5!Hn delta 44 wcmeyC_$+Zln&4zPVS~+c1Zx<9428+FM0i+v8MqjfH~R{!gM~KF5{Z!k093CG{{R30 diff --git a/lib/MSICALib b/lib/MSICALib index c1e18dd..83d06ba 160000 --- a/lib/MSICALib +++ b/lib/MSICALib @@ -1 +1 @@ -Subproject commit c1e18dddc668c6bf698eaf8358f428b9a01df824 +Subproject commit 83d06ba9f89dbbd5e280dac853d02a1bf07b5ee5 diff --git a/lib/libZRCola/MSIBuild/Makefile b/lib/libZRCola/MSIBuild/Makefile index e03efe5..30aca43 100644 --- a/lib/libZRCola/MSIBuild/Makefile +++ b/lib/libZRCola/MSIBuild/Makefile @@ -17,7 +17,7 @@ # along with ZRCola. If not, see . # -!INCLUDE "..\..\..\MSI\include\MSIBuildCfg.mak" +!INCLUDE "..\..\..\include\MSIBuildCfg.mak" ###################################################################### @@ -25,7 +25,7 @@ All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" -"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Signature_ @@ -40,7 +40,7 @@ OLDZRCOLADIR cllibZRCola10u_vc100.dll.$(PLAT) All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" -"$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Signature_ ComponentId Type @@ -60,7 +60,7 @@ cllibZRCola10u_vc100.dll.x64 {23078D23-1397-4FD7-BB32-E012FEF8645A} 1 All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt" -"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Component ComponentId Directory_ Attributes Condition KeyPath @@ -80,7 +80,7 @@ complibZRCola.dll.x64 {23078D23-1397-4FD7-BB32-E012FEF8645A} ZRCOLABINDIR 256 f All :: "$(LANG).$(PLAT).$(CFG).File-1.idt" -"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL File Component_ FileName FileSize Version Language Attributes Sequence diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile index d7a857c..caec237 100644 --- a/lib/libZRColaUI/MSIBuild/Makefile +++ b/lib/libZRColaUI/MSIBuild/Makefile @@ -17,7 +17,7 @@ # along with ZRCola. If not, see . # -!INCLUDE "..\..\..\MSI\include\MSIBuildCfg.mak" +!INCLUDE "..\..\..\include\MSIBuildCfg.mak" ###################################################################### @@ -25,7 +25,7 @@ All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" -"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Property Signature_ @@ -40,7 +40,7 @@ OLDZRCOLADIR cllibZRColaUI10u_vc100.dll.$(PLAT) All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" -"$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Signature_ ComponentId Type @@ -60,7 +60,7 @@ cllibZRColaUI10u_vc100.dll.x64 {360E78E5-9560-4C52-B806-45EDC682BB17} 1 All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt" -"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Component ComponentId Directory_ Attributes Condition KeyPath @@ -80,7 +80,7 @@ complibZRColaUI.dll.x64 {360E78E5-9560-4C52-B806-45EDC682BB17} ZRCOLABINDIR 256 All :: "$(LANG).$(PLAT).$(CFG).File-1.idt" -"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" +"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL File Component_ FileName FileSize Version Language Attributes Sequence diff --git a/lib/wxExtend b/lib/wxExtend index b9eaa9e..ccd5dc8 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit b9eaa9ea39caeea3fc57d7be9ed53f8f640a78e2 +Subproject commit ccd5dc8a19d31777df7375a19e4f9331c7d9e6a1