Compile fixes, warnings etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -84,6 +84,8 @@ GUI_TK_INCLUDE = @GUI_TK_INCLUDE@
|
||||
GUI_TK_LIBRARY = @GUI_TK_LIBRARY@
|
||||
GUI_TK_LINK = @GUI_TK_LINK@
|
||||
|
||||
WX_LINK = @WX_LINK@
|
||||
|
||||
OPENGL_INCLUDE = @OPENGL_INCLUDE@
|
||||
OPENGL_LIBRARY = @OPENGL_LIBRARY@
|
||||
OPENGL_LINK = @OPENGL_LINK@
|
||||
@@ -107,7 +109,7 @@ $(X_CFLAGS)
|
||||
# -I$(WXBASEDIR)/src/zlib \
|
||||
# -I$(WXBASEDIR)/src/gdk_imlib \
|
||||
|
||||
WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
|
||||
WX_LIBS = -L$(GLOBAL_LIB_DIR) $(WX_LINK)
|
||||
|
||||
OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
|
||||
|
||||
|
@@ -36,6 +36,7 @@ s|*X_PRE_LIBS*|@X_PRE_LIBS@|g
|
||||
s|*GUI_TK_INCLUDE*|@GUI_TK_INCLUDE@|g
|
||||
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|*OPENGL_INCLUDE*|@OPENGL_INCLUDE@|g
|
||||
s|*OPENGL_LIBRARY*|@OPENGL_LIBRARY@|g
|
||||
@@ -47,4 +48,4 @@ s|*THREADS_LINK*|@THREADS_LINK@|g
|
||||
s|*EXTRA_LINK*|@EXTRA_LINK@|g
|
||||
s|*GTK_JOYSTICK*|@GTK_JOYSTICK@|g
|
||||
s|*UNIX_THREAD*|@UNIX_THREAD@|g
|
||||
s|*IOBC_C_SRC*|@IODBC_C_SRC@|g
|
||||
s|*IODBC_C_SRC*|@IODBC_C_SRC@|g
|
||||
|
Reference in New Issue
Block a user