Changes to allow Cygwin to compile in non-PCH mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -53,6 +53,9 @@
|
||||
#include <windows.h> // for GetTempFileName
|
||||
#elif (defined(__UNIX__) || defined(__GNUWIN32__))
|
||||
#include <unistd.h>
|
||||
#ifdef __GNUWIN32__
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#elif (defined(__WXSTUBS__))
|
||||
// Have to ifdef this for different environments
|
||||
#include <io.h>
|
||||
|
@@ -39,6 +39,7 @@ typedef UINT MMRESULT;
|
||||
#define NO_JOYGETPOSEX
|
||||
#endif
|
||||
|
||||
#include <wx/window.h>
|
||||
#include <wx/msw/joystick.h>
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxJoystick, wxObject)
|
||||
|
@@ -21,7 +21,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx.h"
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
|
||||
#if defined(__WIN95__)
|
||||
|
@@ -60,12 +60,9 @@ DOCDIR = $(WXDIR)\docs
|
||||
|
||||
GENERICOBJS= \
|
||||
$(GENDIR)/choicdgg.$(OBJSUFF) \
|
||||
$(GENDIR)/colrdlgg.$(OBJSUFF) \
|
||||
$(GENDIR)/dirdlgg.$(OBJSUFF) \
|
||||
$(GENDIR)/fontdlgg.$(OBJSUFF) \
|
||||
$(GENDIR)/gridg.$(OBJSUFF) \
|
||||
$(GENDIR)/laywin.$(OBJSUFF) \
|
||||
$(GENDIR)/msgdlgg.$(OBJSUFF) \
|
||||
$(GENDIR)/panelg.$(OBJSUFF) \
|
||||
$(GENDIR)/prop.$(OBJSUFF) \
|
||||
$(GENDIR)/propform.$(OBJSUFF) \
|
||||
@@ -77,8 +74,11 @@ GENERICOBJS= \
|
||||
$(GENDIR)/tabg.$(OBJSUFF) \
|
||||
$(GENDIR)/textdlgg.$(OBJSUFF)
|
||||
|
||||
# $(GENDIR)/colrdlgg.$(OBJSUFF) \
|
||||
# $(GENDIR)/fontdlgg.$(OBJSUFF) \
|
||||
# $(GENDIR)/prntdlgg.$(OBJSUFF) \
|
||||
# $(GENDIR)/printps.$(OBJSUFF) \
|
||||
# $(GENDIR)/msgdlgg.$(OBJSUFF) \
|
||||
|
||||
COMMONOBJS = \
|
||||
$(COMMDIR)/config.$(OBJSUFF) \
|
||||
|
@@ -22,6 +22,8 @@
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include <stdio.h>
|
||||
#include <wx/utils.h>
|
||||
#include <wx/brush.h>
|
||||
#endif
|
||||
|
||||
#ifdef __WIN95__
|
||||
|
@@ -21,15 +21,19 @@
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/defs.h"
|
||||
#include "wx/window.h"
|
||||
#include "wx/frame.h"
|
||||
#include "wx/utils.h"
|
||||
#endif
|
||||
|
||||
#ifdef __WIN95__
|
||||
|
||||
#include <wx/msw/taskbar.h>
|
||||
#include <string.h>
|
||||
#include <windows.h>
|
||||
#include <wx/msw/taskbar.h>
|
||||
#include <wx/msw/private.h>
|
||||
|
||||
#ifdef __GNUWIN32__
|
||||
|
@@ -28,7 +28,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx.h"
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
|
||||
#if defined(__WIN95__)
|
||||
@@ -54,6 +54,10 @@
|
||||
#undef GetNextSibling
|
||||
#endif
|
||||
|
||||
#ifdef GetClassInfo
|
||||
#undef GetClassInfo
|
||||
#endif
|
||||
|
||||
#include "wx/msw/treectrl.h"
|
||||
|
||||
// Bug in headers, sometimes
|
||||
|
Reference in New Issue
Block a user