Permalink
Browse files

v1.0.96.00

Fix AutoHotkeySC build error
Disable mbcs builds on x64
  • Loading branch information...
1 parent 3f6b181 commit 12f4ae8d034738fad6d86c0ee40d1fc7ba18d70d @Lexikos committed Mar 21, 2011
Showing with 9 additions and 13 deletions.
  1. +0 −6 AutoHotkeyx.sln
  2. +7 −5 source/Debugger.cpp
  3. +2 −2 source/ahkversion.h
View
@@ -30,15 +30,13 @@ Global
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Debug(mbcs)|Win32.ActiveCfg = Debug(mbcs)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Debug(mbcs)|Win32.Build.0 = Debug(mbcs)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Debug(mbcs)|x64.ActiveCfg = Debug(mbcs)|x64
- {76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Debug(mbcs)|x64.Build.0 = Debug(mbcs)|x64
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Debug|Win32.ActiveCfg = Debug|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Debug|Win32.Build.0 = Debug|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Debug|x64.ActiveCfg = Debug|x64
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Debug|x64.Build.0 = Debug|x64
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Release(mbcs)|Win32.ActiveCfg = Release(mbcs)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Release(mbcs)|Win32.Build.0 = Release(mbcs)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Release(mbcs)|x64.ActiveCfg = Release(mbcs)|x64
- {76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Release(mbcs)|x64.Build.0 = Release(mbcs)|x64
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Release(minimal)|Win32.ActiveCfg = Release(minimal)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Release(minimal)|Win32.Build.0 = Release(minimal)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Release(minimal)|x64.ActiveCfg = Release(minimal)|x64
@@ -54,7 +52,6 @@ Global
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Self-contained(mbcs)|Win32.ActiveCfg = Self-contained(mbcs)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Self-contained(mbcs)|Win32.Build.0 = Self-contained(mbcs)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Self-contained(mbcs)|x64.ActiveCfg = Self-contained(mbcs)|x64
- {76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Self-contained(mbcs)|x64.Build.0 = Self-contained(mbcs)|x64
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Self-contained(minimal)|Win32.ActiveCfg = Self-contained(minimal)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Self-contained(minimal)|Win32.Build.0 = Self-contained(minimal)|Win32
{76EFDEE3-81CF-4ADA-94DC-EA5509FF6FFC}.Self-contained(minimal)|x64.ActiveCfg = Self-contained(minimal)|x64
@@ -66,15 +63,13 @@ Global
{39037993-9571-4DF2-8E39-CD2909043574}.Debug(mbcs)|Win32.ActiveCfg = Debug(mbcs)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Debug(mbcs)|Win32.Build.0 = Debug(mbcs)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Debug(mbcs)|x64.ActiveCfg = Debug(mbcs)|x64
- {39037993-9571-4DF2-8E39-CD2909043574}.Debug(mbcs)|x64.Build.0 = Debug(mbcs)|x64
{39037993-9571-4DF2-8E39-CD2909043574}.Debug|Win32.ActiveCfg = Debug|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Debug|Win32.Build.0 = Debug|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Debug|x64.ActiveCfg = Debug|x64
{39037993-9571-4DF2-8E39-CD2909043574}.Debug|x64.Build.0 = Debug|x64
{39037993-9571-4DF2-8E39-CD2909043574}.Release(mbcs)|Win32.ActiveCfg = Release(mbcs)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Release(mbcs)|Win32.Build.0 = Release(mbcs)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Release(mbcs)|x64.ActiveCfg = Release(mbcs)|x64
- {39037993-9571-4DF2-8E39-CD2909043574}.Release(mbcs)|x64.Build.0 = Release(mbcs)|x64
{39037993-9571-4DF2-8E39-CD2909043574}.Release(minimal)|Win32.ActiveCfg = Release(minimal)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Release(minimal)|Win32.Build.0 = Release(minimal)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Release(minimal)|x64.ActiveCfg = Release(minimal)|x64
@@ -89,7 +84,6 @@ Global
{39037993-9571-4DF2-8E39-CD2909043574}.Self-contained(mbcs)|Win32.ActiveCfg = Release(mbcs)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Self-contained(mbcs)|Win32.Build.0 = Release(mbcs)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Self-contained(mbcs)|x64.ActiveCfg = Release(mbcs)|x64
- {39037993-9571-4DF2-8E39-CD2909043574}.Self-contained(mbcs)|x64.Build.0 = Release(mbcs)|x64
{39037993-9571-4DF2-8E39-CD2909043574}.Self-contained(minimal)|Win32.ActiveCfg = Release(minimal)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Self-contained(minimal)|Win32.Build.0 = Release(minimal)|Win32
{39037993-9571-4DF2-8E39-CD2909043574}.Self-contained(minimal)|x64.ActiveCfg = Release(minimal)|x64
View
@@ -14,19 +14,21 @@ freely, without restriction.
#include "stdafx.h"
+#include "defines.h"
+#include "globaldata.h" // for access to many global vars
+#include "script_object.h"
+#include "script_com.h"
+#include "TextIO.h"
+//#include "Debugger.h" // included by globaldata.h
+
#ifdef CONFIG_DEBUGGER
// helper macro for WriteF()
#define U4T(s) CStringUTF8FromTChar(s).GetString()
-#include "defines.h"
#include <ws2tcpip.h>
#include <wspiapi.h> // for getaddrinfo() on versions of Windows earlier than XP.
#include <stdarg.h>
-//#include "Debugger.h" // included by globaldata.h
-#include "globaldata.h" // for access to many global vars
-#include "TextIO.h"
-#include "script_com.h"
#include <typeinfo> // for typeid().
Debugger g_Debugger;
View
@@ -1,2 +1,2 @@
-#define AHK_VERSION "1.0.95.00"
-#define AHK_VERSION_N 1,0,95,0
+#define AHK_VERSION "1.0.96.00"
+#define AHK_VERSION_N 1,0,96,0

0 comments on commit 12f4ae8

Please sign in to comment.