- made notepad compile with Cygwin

- made changes to the precompiler directives to check for specific
  features instead of checking for the environment version.
This commit is contained in:
Andriy Palamarchuk 2002-02-20 18:57:10 +00:00 committed by Alexandre Julliard
parent 8513907f2c
commit 5d5f36f7ce
4 changed files with 9 additions and 52 deletions

View File

@ -16,14 +16,6 @@
#include "language.h" #include "language.h"
#include "dialog.h" #include "dialog.h"
#ifdef LCC
#define LCC_HASASSERT
#include "lcc.h"
#else
#include "wine/version.h"
#include "winnls.h"
#endif
static LRESULT WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); static LRESULT WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);

View File

@ -1,39 +0,0 @@
/*
* lcc.h
*
* Copyright 1999 by Marcel Baur <mbaur@g26.ethz.ch>
* To be distributed under the Wine license
*
* This file is only required when compiling Notepad using LCC-WIN32
*/
#ifdef LCC
#include <assert.h>
#include "shellapi.h"
#define HANDLE HANDLE
#define INVALID_HANDLE_VALUE INVALID_HANDLE_VALUE
#define WINE_RELEASE_INFO "Compiled using LCC"
#define OIC_WINLOGO 0
#ifndef LCC_HASASSERT
/* prevent multiple inclusion of assert methods */
int _assertfail(char *__msg, char *__cond, char *__file, int __line) {
CHAR szMessage[255];
strcat(szMessage, "Assert failure ");
strcat(szMessage, __msg);
strcat(szMessage, "\n");
strcat(szMessage, "in line ");
strcat(szMessage, "of file ");
strcat(szMessage, __line);
MessageBox(0, szMessage, "ERROR: ASSERT FAILURE", MB_ICONEXCLAMATION);
}
#endif
#endif

View File

@ -25,10 +25,6 @@
#include <stdio.h> #include <stdio.h>
#include "windows.h" #include "windows.h"
#ifdef LCC
#include "lcc.h"
#endif
#include "main.h" #include "main.h"
#include "license.h" #include "license.h"
#include "dialog.h" #include "dialog.h"

View File

@ -11,13 +11,21 @@
#define HELPFILE "notepad.hlp" #define HELPFILE "notepad.hlp"
#define LOGPREFIX ".LOG" #define LOGPREFIX ".LOG"
#define DEFAULTICON OIC_WINLOGO
/* hide the following from winerc */ /* hide the following from winerc */
#ifndef RC_INVOKED #ifndef RC_INVOKED
#define WINE_RELEASE_INFO "Wine (www.winehq.com)"
#include "commdlg.h" #include "commdlg.h"
/***** Compatibility *****/
#ifndef OIC_WINLOGO
#define OIC_WINLOGO 32517
#endif
#define DEFAULTICON OIC_WINLOGO
typedef struct typedef struct
{ {
HANDLE hInstance; HANDLE hInstance;