apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r586273 - /apr/apr-iconv/trunk/build/modules.mk.win
Date Fri, 19 Oct 2007 06:04:40 GMT
Author: wrowe
Date: Thu Oct 18 23:04:39 2007
New Revision: 586273

URL: http://svn.apache.org/viewvc?rev=586273&view=rev
Log:
Why so many modes?  We have 1.2 on trunk and I don't see
a reason to split out 1.3 anytime in the near or even far
future; it needs to be able to look out for NT\* build
and 9x\* build directory trees of APR to finish it's link
since it doesn't have the same dependency tricks as the
studio projects do.

And of course, presenting X86.

Modified:
    apr/apr-iconv/trunk/build/modules.mk.win

Modified: apr/apr-iconv/trunk/build/modules.mk.win
URL: http://svn.apache.org/viewvc/apr/apr-iconv/trunk/build/modules.mk.win?rev=586273&r1=586272&r2=586273&view=diff
==============================================================================
--- apr/apr-iconv/trunk/build/modules.mk.win (original)
+++ apr/apr-iconv/trunk/build/modules.mk.win Thu Oct 18 23:04:39 2007
@@ -14,58 +14,178 @@
 BUILD_MODE = release
 BIND_MODE  = shared
 
-!IF "$(BUILD_MODE)" == "release" || "$(BUILD_MODE)" == "Release"
+!IF "$(BUILD_MODE)" == "release" || "$(BUILD_MODE)" == "Release" \
+ || "$(BUILD_MODE)" == "Win32 Release"
+
 !IF "$(BIND_MODE)" == "shared"
-# release shared
 API_LIBS = $(APR_SOURCE)\Release\libapr-1.lib \
 	   $(API_SOURCE)\Release\libapriconv-1.lib
 CFG_CFLAGS  = /MD /Zi /O2 /Oy- /D "NDEBUG"
-CFG_LDFLAGS = /debug /opt:ref /incremental:no
+CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
 CFG_OUTPUT  = Release\iconv
 
-!ELSE
-!IF "$(BIND_MODE)" == "static"
-# release static
+!ELSEIF "$(BIND_MODE)" == "static"
 API_LIBS = $(APR_SOURCE)\LibR\apr-1.lib \
 	   $(API_SOURCE)\LibR\apriconv-1.lib \
 	  kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
 CFG_CFLAGS  = /MD /Zi /O2 /Oy- /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
-CFG_LDFLAGS = /debug /opt:ref /incremental:no
+CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
 CFG_OUTPUT  = LibR\iconv
 
 !ELSE
 !ERROR Unknown bind mode "$(BIND_MODE)"
 !ENDIF
+
+!ELSEIF "$(BUILD_MODE)" == "debug" || "$(BUILD_MODE)" == "Debug" \
+     || "$(BUILD_MODE)" == "Win32 Debug"
+
+!IF "$(BIND_MODE)" == "shared"
+API_LIBS = $(APR_SOURCE)\Debug\libapr-1.lib \
+	   $(API_SOURCE)\Debug\libapriconv-1.lib
+CFG_CFLAGS  = /MDd /Zi /Od /EHsc /D "_DEBUG"
+CFG_LDFLAGS = /debug /incremental:no /machine:X86
+CFG_OUTPUT  = Debug\iconv
+
+!ELSEIF "$(BIND_MODE)" == "static"
+APR_LIB = $(APR_SOURCE)\LibD\apr-1.lib \
+	  $(API_SOURCE)\LibD\apriconv-1.lib \
+	  kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
+CFG_CFLAGS  = /MDd /Zi /Od /EHsc /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
+CFG_LDFLAGS = /debug /incremental:no /machine:X86
+CFG_OUTPUT  = LibD\iconv
+
+!ELSE
+!ERROR Unknown bind mode "$(BIND_MODE)"
 !ENDIF
 
+!ELSEIF "$(BUILD_MODE)" == "Win32 Release9x"
+
+!IF "$(BIND_MODE)" == "shared"
+API_LIBS = $(APR_SOURCE)\9x\Release\libapr-1.lib \
+	   $(API_SOURCE)\Release\libapriconv-1.lib
+CFG_CFLAGS  = /MD /Zi /O2 /Oy- /D "NDEBUG"
+CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
+CFG_OUTPUT  = Release\iconv
+
+!ELSEIF "$(BIND_MODE)" == "static"
+API_LIBS = $(APR_SOURCE)\9x\LibR\apr-1.lib \
+	   $(API_SOURCE)\LibR\apriconv-1.lib \
+	  kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
+CFG_CFLAGS  = /MD /Zi /O2 /Oy- /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
+CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
+CFG_OUTPUT  = LibR\iconv
+
 !ELSE
-!IF "$(BUILD_MODE)" == "debug" || "$(BUILD_MODE)" == "Debug"
+!ERROR Unknown bind mode "$(BIND_MODE)"
+!ENDIF
+
+!ELSEIF "$(BUILD_MODE)" == "Win32 Debug9x"
+
 !IF "$(BIND_MODE)" == "shared"
-# debug shared
-API_LIBS = $(APR_SOURCE)\Debug\libapr-1.lib \
+API_LIBS = $(APR_SOURCE)\9x\Debug\libapr-1.lib \
 	   $(API_SOURCE)\Debug\libapriconv-1.lib
 CFG_CFLAGS  = /MDd /Zi /Od /EHsc /D "_DEBUG"
-CFG_LDFLAGS = /debug /incremental:no
+CFG_LDFLAGS = /debug /incremental:no /machine:X86
 CFG_OUTPUT  = Debug\iconv
 
+!ELSEIF "$(BIND_MODE)" == "static"
+APR_LIB = $(APR_SOURCE)\9x\LibD\apr-1.lib \
+	  $(API_SOURCE)\LibD\apriconv-1.lib \
+	  kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
+CFG_CFLAGS  = /MDd /Zi /Od /EHsc /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
+CFG_LDFLAGS = /debug /incremental:no /machine:X86
+CFG_OUTPUT  = LibD\iconv
+
 !ELSE
-!IF "$(BIND_MODE)" == "static"
-# debug static
-APR_LIB = $(APR_SOURCE)\LibD\apr-1.lib \
+!ERROR Unknown bind mode "$(BIND_MODE)"
+!ENDIF
+
+!ELSEIF "$(BUILD_MODE)" == "Win32 ReleaseNT"
+
+!IF "$(BIND_MODE)" == "shared"
+API_LIBS = $(APR_SOURCE)\NT\Release\libapr-1.lib \
+	   $(API_SOURCE)\Release\libapriconv-1.lib
+CFG_CFLAGS  = /MD /Zi /O2 /Oy- /D "NDEBUG"
+CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
+CFG_OUTPUT  = Release\iconv
+
+!ELSEIF "$(BIND_MODE)" == "static"
+API_LIBS = $(APR_SOURCE)\NT\LibR\apr-1.lib \
+	   $(API_SOURCE)\LibR\apriconv-1.lib \
+	  kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
+CFG_CFLAGS  = /MD /Zi /O2 /Oy- /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
+CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
+CFG_OUTPUT  = LibR\iconv
+
+!ELSE
+!ERROR Unknown bind mode "$(BIND_MODE)"
+!ENDIF
+
+!ELSEIF "$(BUILD_MODE)" == "Win32 DebugNT"
+
+!IF "$(BIND_MODE)" == "shared"
+API_LIBS = $(APR_SOURCE)\NT\Debug\libapr-1.lib \
+	   $(API_SOURCE)\Debug\libapriconv-1.lib
+CFG_CFLAGS  = /MDd /Zi /Od /EHsc /D "_DEBUG"
+CFG_LDFLAGS = /debug /incremental:no /machine:X86
+CFG_OUTPUT  = Debug\iconv
+
+!ELSEIF "$(BIND_MODE)" == "static"
+APR_LIB = $(APR_SOURCE)\NT\LibD\apr-1.lib \
 	  $(API_SOURCE)\LibD\apriconv-1.lib \
 	  kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
 CFG_CFLAGS  = /MDd /Zi /Od /EHsc /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
-CFG_LDFLAGS = /debug /incremental:no
+CFG_LDFLAGS = /debug /incremental:no /machine:X86
 CFG_OUTPUT  = LibD\iconv
 
 !ELSE
 !ERROR Unknown bind mode "$(BIND_MODE)"
 !ENDIF
+
+!ELSEIF "$(BUILD_MODE)" == "x64 Release"
+
+!IF "$(BIND_MODE)" == "shared"
+API_LIBS = $(APR_SOURCE)\x64\Release\libapr-1.lib \
+	   $(API_SOURCE)\x64\Release\libapriconv-1.lib
+CFG_CFLAGS  = /MD /Zi /O2 /Oy- /D "NDEBUG"
+CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X64
+CFG_OUTPUT  = x64\Release\iconv
+
+!ELSEIF "$(BIND_MODE)" == "static"
+API_LIBS = $(APR_SOURCE)\x64\LibR\apr-1.lib \
+	   $(API_SOURCE)\x64\LibR\apriconv-1.lib \
+	  kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
+CFG_CFLAGS  = /MD /Zi /O2 /Oy- /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
+CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X64
+CFG_OUTPUT  = x64\LibR\iconv
+
+!ELSE
+!ERROR Unknown bind mode "$(BIND_MODE)"
+!ENDIF
+
+!ELSEIF "$(BUILD_MODE)" == "x64 Debug"
+
+!IF "$(BIND_MODE)" == "shared"
+API_LIBS = $(APR_SOURCE)\x64\Debug\libapr-1.lib \
+	   $(API_SOURCE)\Debug\libapriconv-1.lib
+CFG_CFLAGS  = /MDd /Zi /Od /EHsc /D "_DEBUG"
+CFG_LDFLAGS = /debug /incremental:no /machine:X64
+CFG_OUTPUT  = Debug\iconv
+
+!ELSEIF "$(BIND_MODE)" == "static"
+APR_LIB = $(APR_SOURCE)\x64\LibD\apr-1.lib \
+	  $(API_SOURCE)\x64\LibD\apriconv-1.lib \
+	  kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
+CFG_CFLAGS  = /MDd /Zi /Od /EHsc /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
+CFG_LDFLAGS = /debug /incremental:no /machine:X64
+CFG_OUTPUT  = x64\LibD\iconv
+
+!ELSE
+!ERROR Unknown bind mode "$(BIND_MODE)"
 !ENDIF
 
 !ELSE
 !ERROR Unknown build mode "$(BUILD_MODE)"
-!ENDIF
 !ENDIF
 
 



Mime
View raw message