diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common.vcxproj | 6 | ||||
| -rw-r--r-- | src/common/common.vcxproj.filters | 4 | ||||
| -rw-r--r-- | src/common/hexchat.h | 4 | ||||
| -rw-r--r-- | src/common/inet.h | 2 | ||||
| -rw-r--r-- | src/common/network.c | 6 | ||||
| -rw-r--r-- | src/common/ssl.c | 4 | ||||
| -rw-r--r-- | src/common/util.c | 3 |
7 files changed, 10 insertions, 19 deletions
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index c38f432b..fe0887d5 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -77,8 +77,8 @@ <ClCompile Include="hexchat.c" /> </ItemGroup> <ItemGroup> - <None Include="..\..\config-win32.h.tt" /> - <ClInclude Include="..\..\config-win32.h" /> + <None Include="..\..\win32\config.h.tt" /> + <ClInclude Include="..\..\config.h" /> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{87554B59-006C-4D94-9714-897B27067BA3}</ProjectGuid> @@ -160,7 +160,7 @@ <PreBuildEvent> <Command><![CDATA[ SET SOLUTIONDIR=$(SolutionDir)..\ -powershell -File "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\config-win32.h.tt" "$(SolutionDir)..\config-win32.h" +powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\config.h.tt" "$(SolutionDir)..\config.h" "$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --header "$(ProjectDir)marshalers.list" > "$(ProjectDir)marshal.h" "$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" > "$(ProjectDir)marshal.c" diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters index 800d8daa..c2d0ce5d 100644 --- a/src/common/common.vcxproj.filters +++ b/src/common/common.vcxproj.filters @@ -104,7 +104,7 @@ <ClInclude Include="hexchat-plugin.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\config-win32.h"> + <ClInclude Include="..\..\config.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="typedef.h"> @@ -195,6 +195,6 @@ </ClCompile> </ItemGroup> <ItemGroup> - <None Include="..\..\config-win32.h.tt" /> + <None Include="..\..\win32\config.h.tt" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/src/common/hexchat.h b/src/common/hexchat.h index 44531468..899d1eaa 100644 --- a/src/common/hexchat.h +++ b/src/common/hexchat.h @@ -17,11 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifdef WIN32 -#include "../../config-win32.h" -#else #include "../../config.h" -#endif #include <glib.h> #include <glib/gstdio.h> diff --git a/src/common/inet.h b/src/common/inet.h index e95a375f..990415be 100644 --- a/src/common/inet.h +++ b/src/common/inet.h @@ -47,7 +47,7 @@ #else -#include "../../config-win32.h" +#include "../../config.h" #ifdef USE_IPV6 #include <winsock2.h> #include <ws2tcpip.h> diff --git a/src/common/network.c b/src/common/network.c index ca0923e1..8790f673 100644 --- a/src/common/network.c +++ b/src/common/network.c @@ -23,12 +23,10 @@ #include <stdio.h> #include <glib.h> -#ifdef WIN32 -#include "../../config-win32.h" /* grab USE_IPV6 and LOOKUPD defines */ -#else +#ifndef WIN32 #include <unistd.h> -#include "../../config.h" #endif +#include "../../config.h" #define WANTSOCKET #define WANTARPA diff --git a/src/common/ssl.c b/src/common/ssl.c index d036fb66..71d4f1da 100644 --- a/src/common/ssl.c +++ b/src/common/ssl.c @@ -27,10 +27,8 @@ #include <openssl/err.h> /* ERR_() */ #ifdef WIN32 #include <openssl/rand.h> /* RAND_seed() */ -#include "../../config-win32.h" /* HAVE_SNPRINTF */ -#else -#include "../../config.h" #endif +#include "../../config.h" #include <time.h> /* asctime() */ #include <string.h> /* strncpy() */ #include "ssl.h" /* struct cert_info */ diff --git a/src/common/util.c b/src/common/util.c index 4582eec6..69ddaff4 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -35,16 +35,15 @@ #include <io.h> #include <VersionHelpers.h> #include "../dirent/dirent-win32.h" -#include "../../config-win32.h" #else #include <unistd.h> #include <pwd.h> #include <sys/time.h> #include <sys/utsname.h> #include <dirent.h> -#include "../../config.h" #endif +#include "../../config.h" #include <fcntl.h> #include <errno.h> #include "hexchat.h" |