Added dataxpm.c to avoid name clash; removed ifdefing around wxDummyChar

[wxWidgets.git] / setup / substit.in

diff --git a/setup/substit.in b/setup/substit.in
index b1ac9908f3ef2bc165cc9139aaf1a06b82c36681..0cfdc97fb04cc5da663dfefb09a206b869b63053 100644 (file)
--- a/setup/substit.in
+++ b/setup/substit.in
@@ -38,9 +38,6 @@ s|*GUI_TK_LIBRARY*|@GUI_TK_LIBRARY@|g
 s|*GUI_TK_LINK*|@GUI_TK_LINK@|g
 s|*WX_LINK*|@WX_LINK@|g
 s|*DL_LIBRARY*|@DL_LIBRARY@|g
 s|*GUI_TK_LINK*|@GUI_TK_LINK@|g
 s|*WX_LINK*|@WX_LINK@|g
 s|*DL_LIBRARY*|@DL_LIBRARY@|g

-s|*OPENGL_INCLUDE*|@OPENGL_INCLUDE@|g
-s|*OPENGL_LIBRARY*|@OPENGL_LIBRARY@|g
-s|*OPENGL_LINK*|@OPENGL_LINK@|g

 s|*TOOLKIT*|@TOOLKIT@|g
 s|*TOOLKIT_DEF*|@TOOLKIT_DEF@|g
 s|*THREADS*|@THREADS@|g
 s|*TOOLKIT*|@TOOLKIT@|g
 s|*TOOLKIT_DEF*|@TOOLKIT_DEF@|g
 s|*THREADS*|@THREADS@|g


@@ -49,3 +46,5 @@ s|*EXTRA_LINK*|@EXTRA_LINK@|g
 s|*GTK_JOYSTICK*|@GTK_JOYSTICK@|g
 s|*UNIX_THREAD*|@UNIX_THREAD@|g
 s|*IODBC_C_SRC*|@IODBC_C_SRC@|g
 s|*GTK_JOYSTICK*|@GTK_JOYSTICK@|g
 s|*UNIX_THREAD*|@UNIX_THREAD@|g
 s|*IODBC_C_SRC*|@IODBC_C_SRC@|g

+s|*PNG_C_SRC*|@PNG_C_SRC@|g
+s|*Z_C_SRC*|@Z_C_SRC@|g