From c6712dabce7071fc6c4217920bf7797c5bb753f0 Mon Sep 17 00:00:00 2001
From: Vlad Mironov <mironych@googlemail.com>
Date: Wed, 28 May 2014 04:43:48 +0000
Subject: unused variables removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@9330 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TrafficCounter/makefile_gcc | 24 +++++++++++++++++++-----
 plugins/Variables/src/variables.cpp |  2 --
 plugins/YAPP/src/services.cpp       |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/plugins/TrafficCounter/makefile_gcc b/plugins/TrafficCounter/makefile_gcc
index 715a961963..692094c54c 100644
--- a/plugins/TrafficCounter/makefile_gcc
+++ b/plugins/TrafficCounter/makefile_gcc
@@ -1,12 +1,16 @@
 ifndef CFG
-  $(error Specify configuration: CFG=Release|Debug)
+	CFG = Release
+endif
+
+ifndef BIT
+	BIT = 32
 endif
 
 COMPILER_OPTS = -c -Wall -fmessage-length=0 -fpermissive -fno-exceptions \
 	-DUNICODE -D_UNICODE
 INCLUDE_PATH = -I../../Include -I../../Include/msapi -I../ExternalAPI
 LINKER_OPTS = -nostartfiles -nodefaultlibs -nostdlib -shared -Wl,-Map,$(OUTDIR)/$(PROJECT_NAME).map -Wl,-e,_DllMain@12
-LIBRARIES = -lgcc -lmsvcrt -lkernel32 -lshell32 -luser32 -lcomctl32 -lgdi32 -lmsimg32 -loleaut32 $(FINDIR)10/lib/mir_core.lib
+LIBRARIES = -lgcc -lmsvcrt -lkernel32 -lshell32 -luser32 -lcomctl32 -lgdi32 -lmsimg32 -loleaut32
 
 ifeq ($(CFG), Release)
   COMPILER_OPTS += -O2 -Os -DNDEBUG
@@ -19,11 +23,21 @@ else
   endif
 endif
 
+ifeq ($(BIT), 32)
+	LIBRARIES += $(FINDIR)10/lib/mir_core.lib
+else
+	ifeq ($(BIT), 64)
+		LIBRARIES += $(FINDIR)10/lib/mir_core64.lib
+	else
+		$(error Invalid bit count specfied: $(BIT))
+	endif
+endif
+
 PROJECT_NAME = TrafficCounter
 SRCDIR = src
 OUTDIR = $(CFG)
 FINDIR = ../../bin
-OUTNAME = $(FINDIR)/$(CFG)/Plugins/$(PROJECT_NAME).dll
+OUTNAME = $(FINDIR)/$(CFG)$(BIT)/Plugins/$(PROJECT_NAME).dll
 
 COMPILER = gcc
 LINKER = gcc
@@ -75,5 +89,5 @@ $(OUTDIR)/%.obj : $(SRCDIR)/%.cpp
 	
 $(OUTDIR)/%.res : res/%.rc
 	@echo Compiling resources...
-	@cat res/*.rc > res/tmp.rc
-	@$(RSC) $(INCLUDE_PATH) -i res/tmp.rc -o $@ -J RC -O COFF -c 0x4E3
+	@cat res/*.rc > res/tmp
+	@$(RSC) $(INCLUDE_PATH) -i res/tmp -o $@ -J RC -O COFF -c 0x4E3
diff --git a/plugins/Variables/src/variables.cpp b/plugins/Variables/src/variables.cpp
index e84c5aa843..b5d91709b3 100644
--- a/plugins/Variables/src/variables.cpp
+++ b/plugins/Variables/src/variables.cpp
@@ -19,8 +19,6 @@
 
 #include "variables.h"
 
-static BOOL bWarningShown = FALSE; // unicode on ansi warning
-
 /* some handles */
 static HANDLE
 	hFormatStringService,
diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp
index b193a3d952..aec7da79f6 100644
--- a/plugins/YAPP/src/services.cpp
+++ b/plugins/YAPP/src/services.cpp
@@ -1,7 +1,7 @@
 #include "common.h"
 
 extern HANDLE hTTButton;
-extern HGENMENU hMenuRoot, hMenuItem, hMenuItemHistory;
+extern HGENMENU hMenuRoot, hMenuItem;
 static HANDLE hEventNotify;
 
 void StripBBCodesInPlace(wchar_t *text)
-- 
cgit v1.2.3