win32: let the compiler do the resource compiling

IDE: set application title to 'Lazarus' so the taskbar button has a capitalized caption (bug #9767)

git-svn-id: trunk@12177 -

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/06/27]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/07/12]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -3781,9 +3781,6 @@ ifeq ($(wildcard ../tools/svn2revisioninc$(SRCEXEEXT)),)
 endif
 	../tools/svn2revisioninc$(SRCEXEEXT) .. revision.inc
 endif
-ifeq ($(OS_TARGET), win32)
-	$(MAKE) lazarus.res
-endif
 ifeq ($(LAZARUS_OPT),)
 	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
 else
@@ -3793,14 +3790,8 @@ idepkg: $(COMPILER_UNITTARGETDIR)
 	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(LAZARUS_OPT) $(OPT) @$(LAZARUS_IDE_CONFIG)'
 bigide: $(COMPILER_UNITTARGETDIR)
 	-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
-ifeq ($(OS_TARGET), win32)
-	$(MAKE) lazarus.res
-endif
 	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
 starter: $(COMPILER_UNITTARGETDIR)
-ifeq ($(OS_TARGET), win32)
-	$(MAKE) startlazarus.res
-endif
 ifeq ($(LAZARUS_OPT),)
 	$(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT)
 else
@@ -3832,9 +3823,9 @@ cleanide:
 	-$(DEL) $(wildcard ../converter/*$(PPUEXT))
 	-$(DEL) $(wildcard ../doceditor/*$(OEXT))
 	-$(DEL) $(wildcard ../doceditor/*$(PPUEXT))
-ifeq ($(OS_TARGET), win32)
+ifneq ($(findstring $(OS_TARGET),win32 win64),)
-	-$(DEL) lazarus.res startlazarus.res
+	-$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or)
-	-$(DEL) lazarus.or startlazarus.or
+	-$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res)
 endif
 cleanlaz: clean cleanide
 purge: cleanlaz

ide/Makefile.fpc

@@ -136,9 +136,6 @@ ifeq ($(wildcard ../tools/svn2revisioninc$(SRCEXEEXT)),)
 endif
 	../tools/svn2revisioninc$(SRCEXEEXT) .. revision.inc
 endif
-ifeq ($(OS_TARGET), win32)
-        $(MAKE) lazarus.res
-endif
 ifeq ($(LAZARUS_OPT),)
         $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT)
 else
@@ -152,16 +149,10 @@ idepkg: $(COMPILER_UNITTARGETDIR)
 #-----------------------------------------------------------------------------
 bigide: $(COMPILER_UNITTARGETDIR)
         -$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
-ifeq ($(OS_TARGET), win32)
-        $(MAKE) lazarus.res
-endif
         $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
 
 #-----------------------------------------------------------------------------
 starter: $(COMPILER_UNITTARGETDIR)
-ifeq ($(OS_TARGET), win32)
-        $(MAKE) startlazarus.res
-endif
 ifeq ($(LAZARUS_OPT),)
         $(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT)
 else
@@ -199,9 +190,9 @@ cleanide:
         -$(DEL) $(wildcard ../converter/*$(PPUEXT))
         -$(DEL) $(wildcard ../doceditor/*$(OEXT))
         -$(DEL) $(wildcard ../doceditor/*$(PPUEXT))
-ifeq ($(OS_TARGET), win32)
+ifneq ($(findstring $(OS_TARGET),win32 win64),)
-        -$(DEL) lazarus.res startlazarus.res
+        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*.or)
-        -$(DEL) lazarus.or startlazarus.or
+        -$(DEL) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res)
 endif
 
 cleanlaz: clean cleanide

ide/lazarus.lpi

@@ -13,6 +13,7 @@
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=""/>
+      <Title Value="Lazarus"/>
     </General>
     <PublishOptions>
       <Version Value="2"/>
@@ -40,12 +41,17 @@
         <PackageName Value="CodeTools"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="1">
+    <Units Count="2">
       <Unit0>
         <Filename Value="lazarus.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Lazarus"/>
       </Unit0>
+      <Unit1>
+        <Filename Value="..\debugger\gdbmidebugger.pp"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="GDBMIDebugger"/>
+      </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

ide/lazarus.pp

@@ -36,11 +36,7 @@ program Lazarus;
 
 {$I ide.inc}
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
-  {$R lazarus.res}
-{$ENDIF}
-
-{$IFDEF WIN64}
   {$R lazarus.rc}
 {$ENDIF}
 
@@ -81,6 +77,7 @@ uses
 
 begin
   LazarusRevisionStr:=RevisionStr;
+  Application.Title:='Lazarus';
   Application.Initialize;
   TMainIDE.ParseCmdLineOptions;
   if Application.Terminated then exit;

ide/startlazarus.lpr

@@ -30,8 +30,8 @@ program StartLazarus;
 
 {$mode objfpc}{$H+}
 
-{$IFDEF WIN32}
+{$IFDEF WINDOWS}
-  {$R *.res}
+  {$R *.rc}
 {$ENDIF}
 
 uses