HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #573 from zhekov/cleanup-win32defines

Browse Source 
Cleanup win32defines
This commit is contained in:
Enrico Tröger 2015-07-22 19:59:38 +02:00
commit c5b0fc459a
5 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -149,7 +149,7 @@ WINDRES = $(host_alias)-windres
geany_private.res: $(top_srcdir)/geany_private.rc
$(WINDRES) -i $(top_srcdir)/geany_private.rc --input-format=rc -o $@ -O coff
libgeany_la_SOURCES += win32.c win32.h win32defines.h
libgeany_la_SOURCES += win32.c win32.h
libgeany_la_LIBADD += -lole32 -lwsock32 -lcomdlg32
libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined
geany_LDFLAGS += -mwindows -mms-bitfields

2
src/socket.c
View File

@ -57,8 +57,6 @@
#ifdef HAVE_SOCKET
#include "win32defines.h" /* should always come before any system headers */
#include "socket.h"
#include "app.h"

2
src/spawn.c
View File

@ -47,8 +47,6 @@
# include "config.h"
#endif
#include "win32defines.h" /* should always come before any system headers */
#include <errno.h>
#include <string.h>

5
src/win32.c
View File

@ -27,7 +27,10 @@
# include "config.h"
#endif
#include "win32defines.h" /* should always come before any system headers */
/* Need Windows XP for SHGetFolderPathAndSubDirW */
#define _WIN32_WINNT 0x0501
/* Needed for SHGFP_TYPE */
#define _WIN32_IE 0x0500
#include "win32.h"

32
src/win32defines.h
View File

@ -1,32 +0,0 @@
/*
* win32defines.h - this file is part of Geany, a fast and lightweight IDE
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef WIN32DEFINES_H
#define WIN32DEFINES_H 1
/* These defines are necessary defines *before* windows.h is included */
#define VC_EXTRALEAN
#define WIN32_LEAN_AND_MEAN
/* Need Windows XP for SHGetFolderPathAndSubDirW */
#define WINVER 0x0501
#define _WIN32_WINNT 0x0501
/* Needed for SHGFP_TYPE */
#define _WIN32_IE 0x0500
#endif /* WIN32DEFINES_H */