Author: nmittler
Date: Thu Jul 6 09:32:44 2006
New Revision: 419611
URL: http://svn.apache.org/viewvc?rev=419611&view=rev
Log:
(AMQ-797) Fixing windows build for activemq-cpp
Modified:
incubator/activemq/trunk/activemq-cpp/makefile-windows-debug.cfg
incubator/activemq/trunk/activemq-cpp/makefile-windows-release.cfg
Modified: incubator/activemq/trunk/activemq-cpp/makefile-windows-debug.cfg
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/makefile-windows-debug.cfg?rev=419611&r1=419610&r2=419611&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/makefile-windows-debug.cfg (original)
+++ incubator/activemq/trunk/activemq-cpp/makefile-windows-debug.cfg Thu Jul 6
09:32:44 2006
@@ -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 @@
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 =
Modified: incubator/activemq/trunk/activemq-cpp/makefile-windows-release.cfg
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-cpp/makefile-windows-release.cfg?rev=419611&r1=419610&r2=419611&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-cpp/makefile-windows-release.cfg
(original)
+++ incubator/activemq/trunk/activemq-cpp/makefile-windows-release.cfg Thu Jul
6 09:32:44 2006
@@ -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 @@
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 =
