From Thom DeCarlo, fixes for Cygwin build

This commit is contained in:
Robert Osfield
2004-11-17 14:56:08 +00:00
parent e9c403839d
commit d0938823af
2 changed files with 8 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
install :
@rm -f $(INSTLOGFILE)
@$(MAKE) __instbin __instdev
@more $(INSTLOGFILE)
@cat $(INSTLOGFILE)
instbin instdev :
@$(MAKE) __$@
@@ -74,17 +74,17 @@ instlinks :
@rm -f $(INSTLOGFILE)
$(MAKE) INSTBINCMD="$(INSTLINKBINCMD)" __instbin
$(MAKE) INSTDEVCMD="$(INSTLINKDEVCMD)" __instdev
@more $(INSTLOGFILE)
@cat $(INSTLOGFILE)
instlinksbin :
@rm -f $(INSTLOGFILE)
$(MAKE) INSTBINCMD="$(INSTLINKBINCMD)" __instbin
@more $(INSTLOGFILE)
@cat $(INSTLOGFILE)
instlinksdev :
@rm -f $(INSTLOGFILE)
@$(MAKE) INSTDEVCMD="$(INSTLINKDEVCMD)" __instdev
@more $(INSTLOGFILE)
@cat $(INSTLOGFILE)
instclean : instcleanbin instcleandev

View File

@@ -496,17 +496,17 @@ endif
#### Cygwin specific definitions
ifeq ($(OS),CYGWIN)
C++ = c++
DEPARG = -M
DEPARG = -M -DWIN32
INC +=
DEF += -DWIN32 -W -Wall -DNOMINMAX
OPTF = -O2
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
SHARED = -shared \
-Wl,--out-implib,$(TOPDIR)/lib/$(OS)/lib$(TARGET_BASENAME).dll.a \
-Wl,--out-implib,$(TOPDIR)/lib/$(OS)$(ARCH)/lib$(TARGET_BASENAME).dll.a \
-Wl,--export-all-symbols
EXE_EXT =.exe
ARCH =
ARCH = 32
ARCHINST =
ARCHARGS =
LINKARGS = -W -Wall
@@ -529,7 +529,7 @@ ifeq ($(OS),CYGWIN)
GDAL_LIBS = `gdal-config --dep-libs`
GDAL_LIBS += `gdal-config --libs`
LIBINST = bin
LIBINST = bin/$(OS)$(ARCH)
PLUGININST = bin/$(OS)$(ARCH)
LIB_PREFIX = cyg