Allegro 4.4 support for ZC

CMakeLists.txt

@@ -43,6 +43,7 @@ include_directories(./include/gme)
 set(ZCSOUNDSOURCES
 	src/zcmusic.cpp 
 	src/zcmusicd.cpp
+	src/alleg_compat.cpp
 )
 
 set(ROMVIEW_MODULES
@@ -98,8 +99,8 @@ endif()
 # Windows
 
 if(MSVC)
-	set(ALLEGROLIB "$<$<CONFIG:DEBUG>:${CMAKE_SOURCE_DIR}/libs/win32dbg/alld_crt.lib>" 
-				   "$<$<CONFIG:RELEASE>:${CMAKE_SOURCE_DIR}/libs/win32/allegro-4.4.2-mt.lib>")
+	set(ALLEGROLIB "$<$<CONFIG:DEBUG>:${CMAKE_SOURCE_DIR}/libs/win32dbg/alleg44-debug.lib>" 
+				   "$<$<CONFIG:RELEASE>:${CMAKE_SOURCE_DIR}/libs/win32/alleg44.lib>")
 
 	add_definitions(-DALLEGRO_MSVC)
 

allegro/CMakeLists.txt

@@ -592,7 +592,7 @@ if(WIN32)
     find_package(DSound)
     find_package(DXGuid)
 
-    if(NOT DDRAW_FOUND OR NOT DINPUT_FOUND OR NOT DSOUND_FOUND OR NOT DXGUID_FOUND)
+    if(NOT DINPUT_FOUND OR NOT DSOUND_FOUND OR NOT DXGUID_FOUND)
         if(MSVC)
             message(FATAL_ERROR
                 "DirectX required for Windows port. You might need to add DirectX include and lib directories to your INCLUDE and LIB environment variables.
@@ -606,7 +606,6 @@ if(WIN32)
     endif()
 
     include_directories(SYSTEM
-        ${DDRAW_INCLUDE_DIR}
         ${DINPUT_INCLUDE_DIR}
         ${DSOUND_INCLUDE_DIR}
         ${DXGUID_INCLUDE_DIR}

allegro/cmake/FindDInput.cmake

@@ -12,8 +12,8 @@ endif(DINPUT_INCLUDE_DIR)
 
 # Makes my life easier.
 if(MSVC)
-    set(HINT_INCLUDE "C:/Program Files/Microsoft DirectX SDK (August 2008)/Include")
-    set(HINT_LIB "C:/Program Files/Microsoft DirectX SDK (August 2008)/Lib")
+    set(HINT_INCLUDE "C:/Program Files/Microsoft DirectX SDK (August 2008)/Include" "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Include")
+    set(HINT_LIB "C:/Program Files/Microsoft DirectX SDK (August 2008)/Lib" "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Lib")
 endif(MSVC)
 
 find_path(DINPUT_INCLUDE_DIR dinput.h

allegro/cmake/FindDSound.cmake

@@ -12,8 +12,8 @@ endif(DSOUND_INCLUDE_DIR)
 
 # Makes my life easier.
 if(MSVC)
-    set(HINT_INCLUDE "C:/Program Files/Microsoft DirectX SDK (August 2008)/Include")
-    set(HINT_LIB "C:/Program Files/Microsoft DirectX SDK (August 2008)/Lib")
+    set(HINT_INCLUDE "C:/Program Files/Microsoft DirectX SDK (August 2008)/Include" "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Include")
+    set(HINT_LIB "C:/Program Files/Microsoft DirectX SDK (August 2008)/Lib" "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Lib")
 endif(MSVC)
 
 find_path(DSOUND_INCLUDE_DIR dsound.h

allegro/cmake/FindDXGuid.cmake

@@ -6,7 +6,7 @@
 
 if(MSVC)
     find_library(DXGUID_LIBRARY NAMES dxguid
-        PATHS "C:/Program Files/Microsoft DirectX SDK (August 2008)/Lib"
+        PATHS "C:/Program Files/Microsoft DirectX SDK (August 2008)/Lib" "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)/Lib"
         PATH_SUFFIXES x86 x64
         )
 else()

allegro/include/allegro/platform/almsvc.h

@@ -78,8 +78,12 @@
 #define INLINE       __inline
 
 #define LONG_LONG    __int64
+
+/* Why does Allegro always insist on doing this? Sigh... -DD */
+#if _MSC_VER <= 1600
 #define int64_t      signed __int64
 #define uint64_t     unsigned __int64
+#endif
 
 #define AL_CONST     const
 

allegro/include/allegro/platform/alplatf.h

@@ -0,0 +1,17 @@
+/* #undef ALLEGRO_BCC32 */
+/* #undef ALLEGRO_BEOS */
+/* #undef ALLEGRO_DJGPP */
+/* #undef ALLEGRO_DMC */
+/* #undef ALLEGRO_HAIKU */
+/* #undef ALLEGRO_MACOSX */
+/* #undef ALLEGRO_MINGW32 */
+/* #undef ALLEGRO_MPW */
+/* #define ALLEGRO_MSVC */
+/* #undef ALLEGRO_PSP */
+/* #undef ALLEGRO_QNX */
+/* #undef ALLEGRO_UNIX */
+/* #undef ALLEGRO_WATCOM */
+
+/* These are always defined now. */
+#define ALLEGRO_NO_ASM
+#define ALLEGRO_USE_C

modules/romview/RomviewCore.txt

@@ -7,6 +7,7 @@ set(ROMVIEW_CORE_SOURCES
 
 src/zsys.cpp
 src/romview.cpp
+src/alleg_compat.cpp
 
 ## End of Romview Core module
 )

modules/zelda/ZeldaCore.txt

@@ -14,6 +14,7 @@ src/zc_init.cpp
 src/zc_items.cpp
 src/init.cpp
 src/win32.cpp
+src/alleg_compat.cpp
 
 ## End of Zelda Core module
 )

modules/zquest/ZQuestCore.txt

@@ -19,6 +19,7 @@ src/sprite.cpp
 src/subscr.cpp
 src/zc_custom.cpp
 src/init.cpp
+src/alleg_compat.cpp
 
 ## End of ZQuest Core module
 )

src/alleg_compat.cpp

@@ -0,0 +1,20 @@
+//--------------------------------------------------------
+//  Zelda Classic
+//
+//  alleg_compat.cpp
+//
+//  Compatibility between allegro versions.
+//
+//--------------------------------------------------------
+
+#include <allegro.h>
+
+PACKFILE *pack_fopen_password(const char *filename, const char *mode, const char *password) {
+	packfile_password(password);
+	return pack_fopen(filename, mode);
+}
+
+uint64_t file_size_ex_password(const char *filename, const char *password) {
+	packfile_password(password);
+	return file_size_ex(filename);
+}

src/alleg_compat.h

@@ -0,0 +1,16 @@
+//--------------------------------------------------------
+//  Zelda Classic
+//
+//  alleg_compat.h
+//
+//  Compatibility between allegro versions.
+//
+//--------------------------------------------------------
+
+#ifndef _ZC_ALLEG_COMPAT_H_
+#define _ZC_ALLEG_COMPAT_H_
+
+PACKFILE *pack_fopen_password(const char *filename, const char *mode, const char *password);
+uint64_t file_size_ex_password(const char *filename, const char *password);
+
+#endif // _ZC_ALLEG_COMPAT_H_

src/zc_alleg.h

@@ -13,8 +13,10 @@
 
 #define DEBUGMODE
 #define ALLEGRO_NO_COMPATIBILITY
+
 #include <allegro.h>
 #include <allegro/internal/aintern.h>
+#include "alleg_compat.h"
 
 #ifdef __cplusplus
 INLINE fix abs(fix f)