geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Window autotools: add link.exe path and remove hard-coded path

Browse Source
This commit is contained in:
soochoi 2006-05-17 19:33:51 +00:00
parent f48131ee38
commit 9416400b21
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
c_jwrapper/jnsscs/windows/Makefile.am
View File

@ -49,22 +49,15 @@ MODULE_EXT = dll
CFILES = jmicasa.c
CSFILES_CSC :=
#INCLUDES = -I. -I.. -I$(CASAROOT)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
# -I/opt/gnome/include/gnome-keyring-1
INCLUDES = -I. -I.. -I$(CASAROOT)/include -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/win32 \
RESOURCES =
DEFINES =
CFLAGS += $(INCLUDES) $(DEFINES)
#LIBS = /LIBPATH:"$(MSC)\lib" /LIBPATH:"$(MSCS)\lib" /LIBPATH:"$(CASAROOT)/lib/Release"
LIBS = /LIBPATH:"$(MSC)\lib" /LIBPATH:"$(MSC)\PlatformSDK\lib" /LIBPATH:"$(CASAROOT)/lib/Release"
LDFLAGS = /VERSION:1.1.1 /MACHINE:IX86 \
/dll
#LIBS = -lpthread -ldl
#LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=jmicasa_lux.exp \
-L$(CASALIBDIR)/$(TARGET_CFG) -lmicasa -Wl,-soname -Wl,libjmicasa.so.1
OBJDIR = ./$(TARGET_CFG)/lib
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o))
@ -87,7 +80,7 @@ $(OBJDIR)/%.o: %.cpp
$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
@echo [======== Linking $@ ========]
$(LINK) $(LIBS) $(LDFLAGS) /OUT:$@ $(OBJS) kernel32.lib ole32.lib micasa.lib
"$(MSC)\bin\$(LINK)" $(LIBS) $(LDFLAGS) /OUT:$@ $(OBJS) kernel32.lib ole32.lib micasa.lib
cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
cp -f $(OBJDIR)/$(MODULE_NAME).lib $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).lib
@ -96,16 +89,6 @@ $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
cp -f $(OBJDIR)/$(MODULE_NAME).lib $(CASALIBDIR)/$(TARGET_CFG)
cp -f $(OBJDIR)/$(MODULE_NAME).lib $(CASABINDIR)$(TARGET_CFG)
#$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
# @echo [======== Linking $@ ========]
# $(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
# cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
#$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT).$(BUILD_VER): $(OBJDIR) $(OBJS)
# @echo [======== Linking $@ ========]
# cc -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
# cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT).$(BUILD_VER) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT).$(BUILD_VER)
$(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)

8
configure.in
View File

@ -21,7 +21,7 @@
AC_INIT(include/micasa.h)
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(CASA, 1.6.487)
AM_INIT_AUTOMAKE(CASA, 1.6.626)
RELEASE=`date +%Y%m%d_%H%M`
AC_SUBST(RELEASE)
AM_MAINTAINER_MODE
@ -82,12 +82,6 @@ case $CSC in
;;
esac
MSC="c:\Program Files (x86)\Microsoft Visual Studio .NET 2003\VC7"
MSCS="c:\Program Files (x86)\Microsoft Visual Studio .NET 2003\VC7\PlatformSDK"
#JAVA="c:\j2sdk1.4.2\bin"
AC_SUBST(MSC)
AC_SUBST(MSCS)
AC_SUBST(CSC)
AC_SUBST(CSC_EXEFLAG)
AC_SUBST(CSC_LIBFLAG)