diff options
| author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-26 22:13:01 +0000 |
|---|---|---|
| committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-11-26 22:13:01 +0000 |
| commit | 2e41f43ace799691e42a8a2cdd01be44fe6bc1aa (patch) | |
| tree | 346c52d7f8cf80fe4da06510b937e3f66fad26df /src | |
| parent | 797edb40bab66cec3fe3bee20aa6f6bcb88dcde6 (diff) | |
A few more Win32 fixes, Anope 1.9 compiles and runs under Windows now.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1799 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.win32 | 6 | ||||
| -rw-r--r-- | src/mod_version.c | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/makefile.win32 b/src/makefile.win32 index 8490ee507..7558c1ad6 100644 --- a/src/makefile.win32 +++ b/src/makefile.win32 @@ -22,13 +22,13 @@ OBJS = actions.obj base64.obj bots.obj botserv.obj channels.obj chanserv.obj co init.obj ircd.obj language.obj log.obj mail.obj main.obj memory.obj \ memoserv.obj messages.obj misc.obj modules.obj mod_version.obj news.obj nickserv.obj operserv.obj \ process.obj send.obj servers.obj sessions.obj slist.obj sockutil.obj \ - timeout.obj users.obj module.obj modulemanager.obj hashcomp.obj + timeout.obj users.obj module.obj modulemanager.obj hashcomp.obj configreader.obj SRCS = actions.c base64.c botserv.c bots.cpp channels.c chanserv.c commands.c compat.c \ config.c datafiles.c encrypt.c events.c helpserv.c hostserv.c init.c ircd.c \ language.c log.c mail.c main.c memory.c memoserv.c messages.c misc.c \ modules.c mod_version.c news.c nickserv.c operserv.c process.c send.c servers.obj sessions.c \ - slist.c sockutil.c timeout.c users.c module.cpp modulemanager.cpp hashcomp.cpp + slist.c sockutil.c timeout.c users.c module.cpp modulemanager.cpp hashcomp.cpp configreader.cpp ########################################################################### @@ -42,7 +42,7 @@ SRCS = actions.c base64.c botserv.c bots.cpp channels.c chanserv.c commands.c c all: $(PROGRAM) $(PROGRAM): $(OBJS) win32.res - $(CC) $(OBJS) win32.res /link /out:$(PROGRAM) /implib:anope.lib $(LIBS) $(LFLAGS) $(MLIBS) $(ELIBS) + $(CC) $(OBJS) win32.res /link /debug /out:$(PROGRAM) /implib:anope.lib $(LIBS) $(LFLAGS) $(MLIBS) $(ELIBS) spotless: -@erase *.obj *.exe *.exp *.lib tools\*.exe *.res win32.rc *.manifest diff --git a/src/mod_version.c b/src/mod_version.c index deff53f97..98c27d259 100644 --- a/src/mod_version.c +++ b/src/mod_version.c @@ -1,16 +1,13 @@ #include "version.h" -#ifndef _WIN32 -#define E extern -#define I extern +#ifdef _WIN32 +# ifdef MODULE_COMPILE +# define E extern __declspec(dllexport) +# else +# define E extern __declspec(dllimport) +# endif #else -#ifndef MODULE_COMPILE -#define E extern __declspec(dllexport) -#define I extern __declspec(dllimport) -#else -#define E extern __declspec(dllimport) -#define I extern __declspec(dllexport) -#endif +# define E extern #endif extern "C" |