Removed USING_CONFIGURE define. As VZ pointed out, checking HAVE_CONFIG_H
is enough to find out wether we're building with configure. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -5,8 +5,6 @@
|
|||||||
#ifndef __GTKSETUPH__
|
#ifndef __GTKSETUPH__
|
||||||
#define __GTKSETUPH__
|
#define __GTKSETUPH__
|
||||||
|
|
||||||
#define USING_CONFIGURE
|
|
||||||
|
|
||||||
#ifdef __GNUG__
|
#ifdef __GNUG__
|
||||||
#pragma interface
|
#pragma interface
|
||||||
#endif
|
#endif
|
||||||
|
@@ -29,8 +29,9 @@
|
|||||||
|
|
||||||
// When using configure, the path must be "zlib.h" I don't know
|
// When using configure, the path must be "zlib.h" I don't know
|
||||||
// what other ports (wxMac, wxMotif without configure) need here.
|
// what other ports (wxMac, wxMotif without configure) need here.
|
||||||
|
// If we are building with ./configure, we trust the zlib path is
|
||||||
#if defined(__WXMSW__) && !defined(USING_CONFIGURE)
|
// given as a -I option.
|
||||||
|
#if defined(__WXMSW__) && !defined(HAVE_CONFIG_H)
|
||||||
#include "..\zlib\zlib.h"
|
#include "..\zlib\zlib.h"
|
||||||
#else
|
#else
|
||||||
#include "zlib.h"
|
#include "zlib.h"
|
||||||
|
Reference in New Issue
Block a user