From 74257346deaa93e12ae61f3c0e48b49f3a7286fd Mon Sep 17 00:00:00 2001 From: ieremiou Date: Fri, 26 May 2006 14:03:43 +0000 Subject: [PATCH] - Fixes for cflash updates - Added makefile.am linking for cflash - Removed self-inserting redundant include in yopyop.. I thought that was fixed before.. sigh. --- desmume/src/windows/Makefile.am | 3 ++- desmume/src/windows/yopyop_private.rc | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desmume/src/windows/Makefile.am b/desmume/src/windows/Makefile.am index 30608ba37..a5f2ebfc9 100644 --- a/desmume/src/windows/Makefile.am +++ b/desmume/src/windows/Makefile.am @@ -1,7 +1,8 @@ bin_PROGRAMS = desmume desmume_SOURCES = \ - CWindow.cpp CWindow.hpp IORegView.cpp IORegView.hpp \ + CWindow.cpp CWindow.hpp cflash.cpp cflash.h \ des_view.cpp des_view.hpp ginfo.cpp ginfo.hpp \ + IORegView.cpp IORegView.hpp \ main.cpp mapView.cpp mapView.hpp mem_view.cpp mem_view.hpp \ oamView.cpp oamView.hpp palView.cpp palView.hpp \ resource.h saves.cpp saves.hpp \ diff --git a/desmume/src/windows/yopyop_private.rc b/desmume/src/windows/yopyop_private.rc index 8a71a9820..8b02076f7 100644 --- a/desmume/src/windows/yopyop_private.rc +++ b/desmume/src/windows/yopyop_private.rc @@ -4,7 +4,6 @@ #include // include for version info constants #include "resources.rc" -#include "yopyop_private.rc" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "DeSmuME.ico"