From 1a447b896bd44e18491f9130c17319baf6418ac3 Mon Sep 17 00:00:00 2001 From: Nathan Christopher Mittler Date: Thu, 6 Jul 2006 16:32:44 +0000 Subject: [PATCH] (AMQ-797) Fixing windows build for activemq-cpp git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@419611 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-cpp/makefile-windows-debug.cfg | 6 ++++-- activemq-cpp/makefile-windows-release.cfg | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/activemq-cpp/makefile-windows-debug.cfg b/activemq-cpp/makefile-windows-debug.cfg index eefd366038..9200dafd3b 100644 --- a/activemq-cpp/makefile-windows-debug.cfg +++ b/activemq-cpp/makefile-windows-debug.cfg @@ -2,7 +2,9 @@ # Compiler specific configuration # -LIBFILE = $(OUTDIR)/libactivemq-cpp.a +OUTDIR = out +LIBRARY_NAME = activemq-cpp +LIBFILE = $(OUTDIR)/lib$(LIBRARY_NAME).a # # GCC/G++ debug for Linux @@ -10,7 +12,7 @@ LIBFILE = $(OUTDIR)/libactivemq-cpp.a CC = g++ -fexceptions -frtti -O0 -g3 -DDEBUG -D_DEBUG -D_REENTRANT -D_WIN32 -DWINVER=0x0502 -DWIN32_LEAN_AND_MEAN LD = g++ -g3 -frtti CCFLAGS = -Wall -LDFLAGS = -L$(OUTDIR) -lactivemq -lcppunit -lws2_32 -lrpcrt4 +LDFLAGS = -L$(OUTDIR) -l$(LIBRARY_NAME) -lcppunit -lws2_32 -lrpcrt4 OUTDIR = out ARFLAGS = diff --git a/activemq-cpp/makefile-windows-release.cfg b/activemq-cpp/makefile-windows-release.cfg index 3dcd5f9b15..f5a4fb9a1f 100644 --- a/activemq-cpp/makefile-windows-release.cfg +++ b/activemq-cpp/makefile-windows-release.cfg @@ -2,7 +2,9 @@ # Compiler specific configuration # -LIBFILE = $(OUTDIR)/libactivemq-cpp.a +OUTDIR = out +LIBRARY_NAME = activemq-cpp +LIBFILE = $(OUTDIR)/lib$(LIBRARY_NAME).a # # GCC/G++ release for Linux @@ -10,7 +12,7 @@ LIBFILE = $(OUTDIR)/libactivemq-cpp.a CC = g++ -fexceptions -frtti -O3 -DNDEBUG -D_REENTRANT -D__WIN32 -DWIN32_LEAN_AND_MEAN LD = g++ -frtti CCFLAGS = -Wall -LDFLAGS = -L$(OUTDIR) -lactivemq -lcppunit -lws2_32 -lrpcrt4 +LDFLAGS = -L$(OUTDIR) -l$(LIBRARY_NAME) -lcppunit -lws2_32 -lrpcrt4 OUTDIR = out ARFLAGS =