From 14e48f9c8abe50c220a87b740c1a507756dd75ca Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 9 Jan 2020 16:14:47 +0100 Subject: [PATCH] Parameterize EAP module MSI building Since this also changes GUIDs of some components, the "EAPTTLS" has been changed to "EAP-TTLS" in filenames. Signed-off-by: Simon Rozman --- EAPMethods/MSIBuild.EAP-TTLS/.gitignore | 9 + EAPMethods/MSIBuild.EAP-TTLS/Makefile | Bin 0 -> 2602 bytes EAPMethods/MSIBuild/Makefile | Bin 34770 -> 6668 bytes EAPMethods/MSIBuild/MakefileEAPMethod.mak | Bin 0 -> 43416 bytes .../{EAPTTLS.vcxproj => EAP-TTLS.vcxproj} | 254 +++++++-------- ...xproj.filters => EAP-TTLS.vcxproj.filters} | 78 ++--- ...EAPTTLS_UI.vcxproj => EAP-TTLS_UI.vcxproj} | 292 +++++++++--------- ...oj.filters => EAP-TTLS_UI.vcxproj.filters} | 276 ++++++++--------- EAPMethods/res/EAPMethod.rc | Bin 5698 -> 5634 bytes EAPMethods/res/EAPMethod_UI.rc | Bin 6316 -> 6252 bytes GEANTLink.sln | 4 +- Makefile | Bin 40302 -> 40294 bytes MakefileEAPMethod.mak | Bin 5666 -> 5566 bytes MakefilePlatCfg.mak | Bin 30800 -> 30808 bytes README.md | 2 +- include/MSIBuildCfg.mak | Bin 14008 -> 14144 bytes lib/TTLS_UI/src/Module.cpp | 2 +- output/locale/.gitignore | 2 +- 18 files changed, 464 insertions(+), 455 deletions(-) create mode 100644 EAPMethods/MSIBuild.EAP-TTLS/.gitignore create mode 100644 EAPMethods/MSIBuild.EAP-TTLS/Makefile create mode 100644 EAPMethods/MSIBuild/MakefileEAPMethod.mak rename EAPMethods/build/{EAPTTLS.vcxproj => EAP-TTLS.vcxproj} (97%) rename EAPMethods/build/{EAPTTLS.vcxproj.filters => EAP-TTLS.vcxproj.filters} (97%) rename EAPMethods/build/{EAPTTLS_UI.vcxproj => EAP-TTLS_UI.vcxproj} (97%) rename EAPMethods/build/{EAPTTLS_UI.vcxproj.filters => EAP-TTLS_UI.vcxproj.filters} (97%) diff --git a/EAPMethods/MSIBuild.EAP-TTLS/.gitignore b/EAPMethods/MSIBuild.EAP-TTLS/.gitignore new file mode 100644 index 0000000..80ea676 --- /dev/null +++ b/EAPMethods/MSIBuild.EAP-TTLS/.gitignore @@ -0,0 +1,9 @@ +/*-1.idt +/*-2.idt +/*-2.idtx +/*.Binary-1 +/*.Binary-2 +/*.Icon-1 +/*.Icon-2 +/*.lst +/*.msm diff --git a/EAPMethods/MSIBuild.EAP-TTLS/Makefile b/EAPMethods/MSIBuild.EAP-TTLS/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..1d97009fe78e4a1f0dc7cf0c6dccc82cbfaaf437 GIT binary patch literal 2602 zcmd6p+fLh15Jl&?Qvbn_7m&a-ZB?mPiF=U}KqUx8s#H1PfYl_mVyBc(>`%2_drnMZ z3R25cbd=avJ98A)4-UOTZ*F-*`4}r-jDIzFK^* z#hJfKud>+3Ug{nSw^`b?`$+8#_HU3)xSk^$ah2|cV=0}R9#6|DKB1D7(Z%x=h4 z+I{TQBg{O8iEF2>TN1P4l(jJ@6@7@Yda@5+r%3nF7`avgH<2BKp~qbY%E%PoxoZ^s z3z014w>pLUxj@$Y3svQ54+Mde6UQ*)B(gmu0e1q{jNQoAu$FQk&MWfo?8kTx&m((* ztR77rr!0uGI!h~{7pox)va71Bysokr-#1(bt{IrD`~Kg0xG%e6OVy?9ge+Y-l8~>f zDaw%3YcvO*m!9)KfrXR`m>^rb6JMyF$j91o3;g}mg5qVP|th5KScM0 zrCK=Rl<=wwg|&mmHc_;EC+R8DWAsiq6{8n%7iueTS;z6X8t+f>sozw&5pk!mlXxzQ z2WCRoIgH3pU~}MXDVwUG(Cg}?%=cn4;djm{O~$+R{21i**wxMIrb}#BS-yY5MX;>t zH$uPk?o*8k^E+ZGSvk{dgLUmI#^#86iP0Z(zv0y}n-T?*4>gtovIcL2#aIbI@C_?xl%@kOyMxK!kpH>rl#^0x>r+L`Bq+Tc^4Na3&mpzbc;M{1y|h)w81kg466V^D zec`T4?sn}x-wsXJ5+{q8s|Jj3ksVEP)mNJeYjX|nb4~KpmKGAZ*j%Do4w=F&X73Js kN488g#P-?aIGBq}l7w$2y`RE&R+YC|cf~|4on?>r55u5j%K!iX literal 0 HcmV?d00001 diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile index b06ecb8f0e34ff72698fa5f7ba59ea9cfc9497b4..25a6ae9239094b9b95ced750318b31a92f659b3b 100644 GIT binary patch delta 45 zcmccA&(veG;S|T_9AP$=&1qpRER)m1Bqm=oRNMR`T90}2iLxooK#>ibPqlF{0syP| B63PGo literal 34770 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 H%|iSSB@{q{ diff --git a/EAPMethods/MSIBuild/MakefileEAPMethod.mak b/EAPMethods/MSIBuild/MakefileEAPMethod.mak new file mode 100644 index 0000000000000000000000000000000000000000..68c0ca7cc7110dbca3e230c7880efee8b0b8ef5c GIT binary patch literal 43416 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 - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - {331B6077-E3E2-4867-B93E-9D3F57280DE7} - EAPTTLS - 10.0 - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - true - Unicode - v142 - - - DynamicLibrary - false - true - Unicode - v142 - - - DynamicLibrary - false - true - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) - - - EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) - - - - - - - - - - - {b385ec2b-c3f4-48bb-9bac-8b996de7f754} - - - {114a70bb-8698-4a0c-8c90-58f22edd8129} - - - {86a6d6a0-4b7d-4134-be81-a5755c77584d} - - - {36b0cf8a-7794-46c3-8099-825ba962b4c7} - - - {4d40cb8a-812e-4f12-b23a-31af743878e8} - - - {ee0ef0d9-a475-4038-8637-5754724f65b0} - - - - - + + + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {331B6077-E3E2-4867-B93E-9D3F57280DE7} + EAP-TTLS + 10.0 + + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + true + + + DynamicLibrary + false + true + Unicode + v142 + + + DynamicLibrary + false + true + Unicode + v142 + + + DynamicLibrary + false + true + Unicode + v142 + true + + + + + + + + + + + + + + + + + + + EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) + + + EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) + + + + + + + + + + + {b385ec2b-c3f4-48bb-9bac-8b996de7f754} + + + {114a70bb-8698-4a0c-8c90-58f22edd8129} + + + {86a6d6a0-4b7d-4134-be81-a5755c77584d} + + + {36b0cf8a-7794-46c3-8099-825ba962b4c7} + + + {4d40cb8a-812e-4f12-b23a-31af743878e8} + + + {ee0ef0d9-a475-4038-8637-5754724f65b0} + + + + + \ No newline at end of file diff --git a/EAPMethods/build/EAPTTLS.vcxproj.filters b/EAPMethods/build/EAP-TTLS.vcxproj.filters similarity index 97% rename from EAPMethods/build/EAPTTLS.vcxproj.filters rename to EAPMethods/build/EAP-TTLS.vcxproj.filters index 1db74dd..dc8bd7e 100644 --- a/EAPMethods/build/EAPTTLS.vcxproj.filters +++ b/EAPMethods/build/EAP-TTLS.vcxproj.filters @@ -1,40 +1,40 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - Source Files - - - - - Resource Files - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + + + Source Files + + + Source Files + + + + + Resource Files + + + + + Source Files + + \ No newline at end of file diff --git a/EAPMethods/build/EAPTTLS_UI.vcxproj b/EAPMethods/build/EAP-TTLS_UI.vcxproj similarity index 97% rename from EAPMethods/build/EAPTTLS_UI.vcxproj rename to EAPMethods/build/EAP-TTLS_UI.vcxproj index fdac601..c438dda 100644 --- a/EAPMethods/build/EAPTTLS_UI.vcxproj +++ b/EAPMethods/build/EAP-TTLS_UI.vcxproj @@ -1,147 +1,147 @@ - - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - {DD7A97CA-F18E-43B7-95C4-D06E6A291624} - EAPTTLS_UI - 10.0 - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - true - Unicode - v142 - - - DynamicLibrary - false - true - Unicode - v142 - - - DynamicLibrary - false - true - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) - - - EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) - - - - - - - - - - - {b385ec2b-c3f4-48bb-9bac-8b996de7f754} - - - {13d2d8b5-f6aa-459d-b5f7-29b95dd9d583} - - - {114a70bb-8698-4a0c-8c90-58f22edd8129} - - - {34680813-3a52-46fb-b5a8-1e4bbf770855} - - - {86a6d6a0-4b7d-4134-be81-a5755c77584d} - - - {7af5b922-7c17-428a-97e0-09e3b41a684d} - - - {36b0cf8a-7794-46c3-8099-825ba962b4c7} - - - {3d309c2e-64ab-4bc4-a16d-468571a2bc1a} - - - {4d40cb8a-812e-4f12-b23a-31af743878e8} - - - {9a25c261-8ade-4938-8393-e857ef0e37e9} - - - {ee0ef0d9-a475-4038-8637-5754724f65b0} - - - {42f0f0f4-c928-4860-a4e4-94991c2c3d90} - - - - - - + + + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {DD7A97CA-F18E-43B7-95C4-D06E6A291624} + EAP-TTLS_UI + 10.0 + + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + true + + + DynamicLibrary + false + true + Unicode + v142 + + + DynamicLibrary + false + true + Unicode + v142 + + + DynamicLibrary + false + true + Unicode + v142 + true + + + + + + + + + + + + + + + + + + + EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) + + + EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) + + + + + + + + + + + {b385ec2b-c3f4-48bb-9bac-8b996de7f754} + + + {13d2d8b5-f6aa-459d-b5f7-29b95dd9d583} + + + {114a70bb-8698-4a0c-8c90-58f22edd8129} + + + {34680813-3a52-46fb-b5a8-1e4bbf770855} + + + {86a6d6a0-4b7d-4134-be81-a5755c77584d} + + + {7af5b922-7c17-428a-97e0-09e3b41a684d} + + + {36b0cf8a-7794-46c3-8099-825ba962b4c7} + + + {3d309c2e-64ab-4bc4-a16d-468571a2bc1a} + + + {4d40cb8a-812e-4f12-b23a-31af743878e8} + + + {9a25c261-8ade-4938-8393-e857ef0e37e9} + + + {ee0ef0d9-a475-4038-8637-5754724f65b0} + + + {42f0f0f4-c928-4860-a4e4-94991c2c3d90} + + + + + + \ No newline at end of file diff --git a/EAPMethods/build/EAPTTLS_UI.vcxproj.filters b/EAPMethods/build/EAP-TTLS_UI.vcxproj.filters similarity index 97% rename from EAPMethods/build/EAPTTLS_UI.vcxproj.filters rename to EAPMethods/build/EAP-TTLS_UI.vcxproj.filters index d88e2f5..c1b97a6 100644 --- a/EAPMethods/build/EAPTTLS_UI.vcxproj.filters +++ b/EAPMethods/build/EAP-TTLS_UI.vcxproj.filters @@ -1,139 +1,139 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {e43059ae-37ac-4b28-84fb-18d1b3972b30} - po;pot - - - - - Header Files - - - - - Source Files - - - Source Files - - - - - Resource Files - - - - - Source Files - - - Resource Files\Localization - - - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {e43059ae-37ac-4b28-84fb-18d1b3972b30} + po;pot + + + + + Header Files + + + + + Source Files + + + Source Files + + + + + Resource Files + + + + + Source Files + + + Resource Files\Localization + + + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + \ No newline at end of file diff --git a/EAPMethods/res/EAPMethod.rc b/EAPMethods/res/EAPMethod.rc index 91f7c5de7f2055c41bd385cb1d2b5db06aa29363..b465a0776e07043167aa2db37e708b3c198b722c 100644 GIT binary patch delta 21 ccmX@4)16@-*n08yX@4*&oF delta 43 ucmZqDIi$1U82jV~b|pbi1{VeeFjQi2WpHE&*u0fpo{JeMy!p1EItu{xMhZRv diff --git a/EAPMethods/res/EAPMethod_UI.rc b/EAPMethods/res/EAPMethod_UI.rc index 2badf3f12c652eb66f2006becbf2de08acf5ff7b..34585aa9f2bdf54f204e701b0febb220191a5655 100644 GIT binary patch delta 21 dcmZ2u_{LzvG4{<|94B}ubBOS4z9o8z2>@a<2toh= delta 43 ucmaE3u*Pu1G4{y~>`H>33@!``V5r34%HYTluz4%{Oqfdke$> diff --git a/GEANTLink.sln b/GEANTLink.sln index e30cfed..943f3d0 100644 --- a/GEANTLink.sln +++ b/GEANTLink.sln @@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EAP Methods", "EAP Methods", "{60BAAC3D-DC98-4C19-BC40-1A86963DE86C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\build\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS", "EAPMethods\build\EAP-TTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}" EndProject @@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\Cred EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS_UI", "EAPMethods\build\EAPTTLS_UI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS_UI", "EAPMethods\build\EAP-TTLS_UI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}" EndProject diff --git a/Makefile b/Makefile index 0a52140ec6d54bf34745684be670117256ba1a2e..44e3cadd05c15ecbaef6e55c373700d6a40df563 100644 GIT binary patch delta 32 mcmaF2i|N@erVSUm1pOEs8GIRB8Ek>rks*LVck|1xRv`ex?h1wg delta 40 scmaF1i|O4irVSUmB%K%>8G;#H8R8lIfGl4i%NB?o83Hyx>}nMP01$5r(*OVf diff --git a/MakefileEAPMethod.mak b/MakefileEAPMethod.mak index b0d5ab34a6bc318e0de39f119f3213fbbf4d57d9..fc9511983c7d59c5ec7ef21e686c0bbdbcfacffb 100644 GIT binary patch delta 86 zcmZ3avrl`&1h&cdIK(DzV2j!;!hV2p^F59$jFUy!r8ZyV+67~9FizgXy9p}F#yEKf g|F+E$0v{MB8;JawTp%bkIYIc?W&;tRMgtKM0Ej3bj{pDw delta 161 zcmdm|y+~)n1U7aj21kZq2G_~_0-}=_vBkmp6S-tJOR+CwgbM%_Y`(;C2rjUBBG+|f zjw<8iF5XQr|w#>p}K+u#EH0-qTtPY~pqyh>DLavtBi$p(TvlLds2A&I@1d`aX6 Gj1K@A!UQ%y7t2fp06DS_&Hw-a delta 31 lcmccdf$_oz#tj-GlP8JAO#UDyw|SY!D@G7!^9QkvL;&t-4mJP) diff --git a/README.md b/README.md index 5e60d9c..cda2fb6 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Before one can attempt to debug EAP DLLs, you should run `nmake register` from a Next, one must configure a network profile to actually use one of this product's EAP modules for the authentication. -EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLS_UI.dll_). +EAP modules are divided into two DLLs: backend (i.e. _EAP-TTLS.dll_) and GUI (i.e. _EAP-TTLS_UI.dll_). ##### Backend DLL diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index 61c57b0bd78883298eb8be121b2e4a862fe47195..c0da966c7e4de960c224e56ad92671b3c91d9e2f 100644 GIT binary patch delta 34 ocmdmydmwLvlF8&X#wvn(46Y203;_(f3?V@1!w|gryzxsW0KW(d82|tP delta 12 TcmX?*wAddCatalog(wxT("wxExtend") wxT(wxExtendVersion)); - s_locale->AddCatalog(wxT("EAPTTLS_UI")); + s_locale->AddCatalog(wxT("EAP-TTLS_UI")); } } diff --git a/output/locale/.gitignore b/output/locale/.gitignore index c98c6af..9b130e8 100644 --- a/output/locale/.gitignore +++ b/output/locale/.gitignore @@ -1,4 +1,4 @@ -*/EAPTTLS_UI.mo +*/EAP-TTLS_UI.mo */EventMonitor.mo */wxExtend*.mo */wxstd.mo