applied the needed change in KeyWords.cxx for notepad2 to build, updated the ico, the toolbar and the manifest with the ones Kai Liu used

git-svn-id: https://notepad2-mod.googlecode.com/svn/trunk@4 28bd50df-7adb-d945-0439-6e466c6a13cc

5 files changed, 14 insertions, 12 deletions

diff --git a/res/Notepad2.exe.manifest b/res/Notepad2.exe.manifest
index 1d492c1..d31c8e5 100644
--- a/res/Notepad2.exe.manifest
+++ b/res/Notepad2.exe.manifest
@@ -2,8 +2,8 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

   <assemblyIdentity

     name="Notepad2"

-    processorArchitecture="x86"

-    version="5.1.0.0"

+    processorArchitecture="*"

+    version="4.1.24.6"

     type="win32"

   />

   <description>Notepad2</description>

@@ -13,7 +13,7 @@
         type="win32"

         name="Microsoft.Windows.Common-Controls"

         version="6.0.0.0"

-        processorArchitecture="x86"

+        processorArchitecture="*"

         publicKeyToken="6595b64144ccf1df"

         language="*"

       />

diff --git a/res/Notepad2.ico b/res/Notepad2.ico
index 0a34ea4..32b4a72 100644
--- a/res/Notepad2.ico
+++ b/res/Notepad2.ico
diff --git a/res/Toolbar.bmp b/res/Toolbar.bmp
index 85206e4..1ab45f3 100644
--- a/res/Toolbar.bmp
+++ b/res/Toolbar.bmp
diff --git a/scintilla/src/KeyWords.cxx b/scintilla/src/KeyWords.cxx
index f5d4c6a..793bec4 100644
--- a/scintilla/src/KeyWords.cxx
+++ b/scintilla/src/KeyWords.cxx
@@ -323,7 +323,7 @@ int Scintilla_LinkLexers() {
 	static int forcer = 0;

 

 // Shorten the code that declares a lexer and ensures it is linked in by calling a method.

-#define LINK_LEXER(lexer) extern LexerModule lexer; forcer += lexer.GetLanguage();

+#define LINK_LEXER(lexer) void(0)

 

 //++Autogenerated -- run src/LexGen.py to regenerate

 //**\(\tLINK_LEXER(\*);\n\)

diff --git a/wdkbuild/build.cmd b/wdkbuild/build.cmd
index 6d39a63..ca442f4 100644
--- a/wdkbuild/build.cmd
+++ b/wdkbuild/build.cmd
@@ -1,19 +1,21 @@
 @echo off

-

-rem set WDKBASEDIR=C:\WinDDK\7600.16385.1

-set WDKBASEDIR=D:\Programme\Microsoft wdk7

+setlocal

+set WDKBASEDIR=C:\progs\WinDDK\7600.16385.1

 

 set INCLUDE=%WDKBASEDIR%\inc\crt;%WDKBASEDIR%\inc\api;%WDKBASEDIR%\inc\api\crt\stl60;%WDKBASEDIR%\inc\ddk

 set LIB=%WDKBASEDIR%\lib\crt\i386;%WDKBASEDIR%\lib\win7\i386

 set LIBPATH=

 set VSCOMNTOOLS=

 

-md "../Release"

-del "../Release/*.obj"

-del "../Release/*.exe"

-del "../Release/*.pdb"

-del "../Release/*.idb"

+md "../Release" >NUL 2>&1

+del "../Release/*.obj" >NUL 2>&1

+del "../Release/*.exe" >NUL 2>&1

+del "../Release/*.pdb" >NUL 2>&1

+del "../Release/*.idb" >NUL 2>&1

 

 "%WDKBASEDIR%\bin\x86\x86\cl.exe" @cl.txt

 "%WDKBASEDIR%\bin\x86\rc.exe" /fo"../Release/Notepad2.res" "..\src\Notepad2.rc"

 "%WDKBASEDIR%\bin\x86\x86\link.exe" @link.txt

+

+endlocal

+pause
\ No newline at end of file