From 6705643a6c04809e6774955745e2d10c360dd8a5 Mon Sep 17 00:00:00 2001 From: Vlad Mironov Date: Mon, 26 May 2014 09:27:20 +0000 Subject: git-svn-id: http://svn.miranda-ng.org/main/trunk@9312 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TrafficCounter/makefile_gcc | 5 +++-- plugins/TrafficCounter/res/resource.rc | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'plugins/TrafficCounter') diff --git a/plugins/TrafficCounter/makefile_gcc b/plugins/TrafficCounter/makefile_gcc index 5baf60ce0e..715a961963 100644 --- a/plugins/TrafficCounter/makefile_gcc +++ b/plugins/TrafficCounter/makefile_gcc @@ -6,7 +6,7 @@ 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)/lib/mir_core.lib +LIBRARIES = -lgcc -lmsvcrt -lkernel32 -lshell32 -luser32 -lcomctl32 -lgdi32 -lmsimg32 -loleaut32 $(FINDIR)10/lib/mir_core.lib ifeq ($(CFG), Release) COMPILER_OPTS += -O2 -Os -DNDEBUG @@ -75,4 +75,5 @@ $(OUTDIR)/%.obj : $(SRCDIR)/%.cpp $(OUTDIR)/%.res : res/%.rc @echo Compiling resources... - @$(RSC) $(INCLUDE_PATH) -i $< -o $@ -J RC -O COFF -c 0x4E3 + @cat res/*.rc > res/tmp.rc + @$(RSC) $(INCLUDE_PATH) -i res/tmp.rc -o $@ -J RC -O COFF -c 0x4E3 diff --git a/plugins/TrafficCounter/res/resource.rc b/plugins/TrafficCounter/res/resource.rc index 7dff79bb8a..c14b8a8aaa 100644 --- a/plugins/TrafficCounter/res/resource.rc +++ b/plugins/TrafficCounter/res/resource.rc @@ -20,10 +20,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #pragma code_page(1251) -#ifdef __GNUC__ -#include "version.rc" -#endif - ///////////////////////////////////////////////////////////////////////////// // // Icon -- cgit v1.2.3