Guest User

mario

a guest
Jan 26th, 2010
402
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.98 KB | None | 0 0
  1. Only in httpd_x64: replace.php
  2. Only in httpd_x64\srclib\apr: libapr.mak
  3. diff -u -r httpd_x64.orig\srclib\apr-iconv\build\modules.mk.win httpd_x64\srclib\apr-iconv\build\modules.mk.win
  4. --- httpd_x64.orig\srclib\apr-iconv\build\modules.mk.win Fri Oct 19 10:49:36 2007
  5. +++ httpd_x64\srclib\apr-iconv\build\modules.mk.win Tue Jan 26 15:56:20 2010
  6. @@ -21,7 +21,7 @@
  7. API_LIBS = $(APR_SOURCE)\Release\libapr-1.lib \
  8. $(API_SOURCE)\Release\libapriconv-1.lib
  9. CFG_CFLAGS = /MD /Zi /O2 /Oy- /D "NDEBUG"
  10. -CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
  11. +CFG_LDFLAGS = /debug /opt:ref /incremental:no
  12. CFG_OUTPUT = Release\iconv
  13.  
  14. !ELSEIF "$(BIND_MODE)" == "static"
  15. @@ -29,7 +29,7 @@
  16. $(API_SOURCE)\LibR\apriconv-1.lib \
  17. kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
  18. CFG_CFLAGS = /MD /Zi /O2 /Oy- /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
  19. -CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
  20. +CFG_LDFLAGS = /debug /opt:ref /incremental:no
  21. CFG_OUTPUT = LibR\iconv
  22.  
  23. !ELSE
  24. @@ -43,7 +43,7 @@
  25. API_LIBS = $(APR_SOURCE)\Debug\libapr-1.lib \
  26. $(API_SOURCE)\Debug\libapriconv-1.lib
  27. CFG_CFLAGS = /MDd /Zi /Od /EHsc /D "_DEBUG"
  28. -CFG_LDFLAGS = /debug /incremental:no /machine:X86
  29. +CFG_LDFLAGS = /debug /incremental:no
  30. CFG_OUTPUT = Debug\iconv
  31.  
  32. !ELSEIF "$(BIND_MODE)" == "static"
  33. @@ -51,7 +51,7 @@
  34. $(API_SOURCE)\LibD\apriconv-1.lib \
  35. kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
  36. CFG_CFLAGS = /MDd /Zi /Od /EHsc /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
  37. -CFG_LDFLAGS = /debug /incremental:no /machine:X86
  38. +CFG_LDFLAGS = /debug /incremental:no
  39. CFG_OUTPUT = LibD\iconv
  40.  
  41. !ELSE
  42. @@ -64,7 +64,7 @@
  43. API_LIBS = $(APR_SOURCE)\9x\Release\libapr-1.lib \
  44. $(API_SOURCE)\Release\libapriconv-1.lib
  45. CFG_CFLAGS = /MD /Zi /O2 /Oy- /D "NDEBUG"
  46. -CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
  47. +CFG_LDFLAGS = /debug /opt:ref /incremental:no
  48. CFG_OUTPUT = Release\iconv
  49.  
  50. !ELSEIF "$(BIND_MODE)" == "static"
  51. @@ -72,7 +72,7 @@
  52. $(API_SOURCE)\LibR\apriconv-1.lib \
  53. kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
  54. CFG_CFLAGS = /MD /Zi /O2 /Oy- /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
  55. -CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
  56. +CFG_LDFLAGS = /debug /opt:ref /incremental:no
  57. CFG_OUTPUT = LibR\iconv
  58.  
  59. !ELSE
  60. @@ -85,7 +85,7 @@
  61. API_LIBS = $(APR_SOURCE)\9x\Debug\libapr-1.lib \
  62. $(API_SOURCE)\Debug\libapriconv-1.lib
  63. CFG_CFLAGS = /MDd /Zi /Od /EHsc /D "_DEBUG"
  64. -CFG_LDFLAGS = /debug /incremental:no /machine:X86
  65. +CFG_LDFLAGS = /debug /incremental:no
  66. CFG_OUTPUT = Debug\iconv
  67.  
  68. !ELSEIF "$(BIND_MODE)" == "static"
  69. @@ -93,7 +93,7 @@
  70. $(API_SOURCE)\LibD\apriconv-1.lib \
  71. kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
  72. CFG_CFLAGS = /MDd /Zi /Od /EHsc /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
  73. -CFG_LDFLAGS = /debug /incremental:no /machine:X86
  74. +CFG_LDFLAGS = /debug /incremental:no
  75. CFG_OUTPUT = LibD\iconv
  76.  
  77. !ELSE
  78. @@ -106,7 +106,7 @@
  79. API_LIBS = $(APR_SOURCE)\NT\Release\libapr-1.lib \
  80. $(API_SOURCE)\Release\libapriconv-1.lib
  81. CFG_CFLAGS = /MD /Zi /O2 /Oy- /D "NDEBUG"
  82. -CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
  83. +CFG_LDFLAGS = /debug /opt:ref /incremental:no
  84. CFG_OUTPUT = Release\iconv
  85.  
  86. !ELSEIF "$(BIND_MODE)" == "static"
  87. @@ -114,7 +114,7 @@
  88. $(API_SOURCE)\LibR\apriconv-1.lib \
  89. kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
  90. CFG_CFLAGS = /MD /Zi /O2 /Oy- /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
  91. -CFG_LDFLAGS = /debug /opt:ref /incremental:no /machine:X86
  92. +CFG_LDFLAGS = /debug /opt:ref /incremental:no
  93. CFG_OUTPUT = LibR\iconv
  94.  
  95. !ELSE
  96. @@ -127,7 +127,7 @@
  97. API_LIBS = $(APR_SOURCE)\NT\Debug\libapr-1.lib \
  98. $(API_SOURCE)\Debug\libapriconv-1.lib
  99. CFG_CFLAGS = /MDd /Zi /Od /EHsc /D "_DEBUG"
  100. -CFG_LDFLAGS = /debug /incremental:no /machine:X86
  101. +CFG_LDFLAGS = /debug /incremental:no
  102. CFG_OUTPUT = Debug\iconv
  103.  
  104. !ELSEIF "$(BIND_MODE)" == "static"
  105. @@ -135,7 +135,7 @@
  106. $(API_SOURCE)\LibD\apriconv-1.lib \
  107. kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
  108. CFG_CFLAGS = /MDd /Zi /Od /EHsc /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "API_DECLARE_STATIC"
  109. -CFG_LDFLAGS = /debug /incremental:no /machine:X86
  110. +CFG_LDFLAGS = /debug /incremental:no
  111. CFG_OUTPUT = LibD\iconv
  112.  
  113. !ELSE
  114. Only in httpd_x64\srclib\apr-iconv: libapriconv.mak
  115. Only in httpd_x64\srclib\apr-util\dbd: apr_dbd_freetds.mak
  116. Only in httpd_x64\srclib\apr-util\dbd: apr_dbd_mysql.mak
  117. Only in httpd_x64\srclib\apr-util\dbd: apr_dbd_odbc.mak
  118. Only in httpd_x64\srclib\apr-util\dbd: apr_dbd_oracle.mak
  119. Only in httpd_x64\srclib\apr-util\dbd: apr_dbd_pgsql.mak
  120. Only in httpd_x64\srclib\apr-util\dbd: apr_dbd_sqlite2.mak
  121. Only in httpd_x64\srclib\apr-util\dbd: apr_dbd_sqlite3.mak
  122. Only in httpd_x64\srclib\apr-util\dbm: apr_dbm_db.mak
  123. Only in httpd_x64\srclib\apr-util\dbm: apr_dbm_gdbm.mak
  124. Only in httpd_x64\srclib\apr-util\ldap: apr_ldap.mak
  125. Only in httpd_x64\srclib\apr-util: libaprutil.mak
Advertisement
Add Comment
Please, Sign In to add comment