changed Makefile to add debug tools ui
need change of autoconfigure script
This commit is contained in:
parent
ae44368182
commit
1071c4087e
|
@ -1,5 +1,4 @@
|
||||||
#include "callbacks.h"
|
#include "callbacks.h"
|
||||||
#include "DeSmuME.xpm"
|
|
||||||
|
|
||||||
/* globals */
|
/* globals */
|
||||||
uint Frameskip = 0;
|
uint Frameskip = 0;
|
||||||
|
@ -167,7 +166,8 @@ void on_menu_rightscreen_activate (GtkMenuItem *menuitem, gpointer user_data)
|
||||||
|
|
||||||
/* MENU TOOLS ***** ***** ***** ***** */
|
/* MENU TOOLS ***** ***** ***** ***** */
|
||||||
void on_menu_IO_regs_activate (GtkMenuItem *menuitem, gpointer user_data) {
|
void on_menu_IO_regs_activate (GtkMenuItem *menuitem, gpointer user_data) {
|
||||||
|
GtkWidget * dlg = glade_xml_get_widget(xml_tools, "wtools_1_IOregs");
|
||||||
|
gtk_widget_show(dlg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -57,5 +57,4 @@ void on_wc_2b_BG0_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
||||||
void on_wc_2b_BG1_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
void on_wc_2b_BG1_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
||||||
void on_wc_2b_BG2_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
void on_wc_2b_BG2_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
||||||
void on_wc_2b_BG3_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
void on_wc_2b_BG3_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
||||||
void on_wc_2b_BG4_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
|
||||||
void on_wc_2b_OBJ_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
void on_wc_2b_OBJ_toggled (GtkToggleButton *togglebutton, gpointer user_data);
|
||||||
|
|
|
@ -68,8 +68,8 @@ int screen (GtkWidget * widget, int offset_pix) {
|
||||||
//TODO : use pixbuf for scaling...
|
//TODO : use pixbuf for scaling...
|
||||||
|
|
||||||
gdk_draw_rgb_image (widget->window,
|
gdk_draw_rgb_image (widget->window,
|
||||||
widget->style->fg_gc[widget->state],0,0,screenImage->w, screenImage->h,
|
widget->style->fg_gc[widget->state],0,0,screenImage->w, screenImage->h,
|
||||||
GDK_RGB_DITHER_NONE,(guchar*)screenImage->pixels,screenImage->pitch);
|
GDK_RGB_DITHER_NONE,(guchar*)screenImage->pixels,screenImage->pitch);
|
||||||
SDL_FreeSurface(screenImage);
|
SDL_FreeSurface(screenImage);
|
||||||
SDL_FreeSurface(rawImage);
|
SDL_FreeSurface(rawImage);
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ gint Keypad_Temp[DESMUME_NB_KEYS];
|
||||||
GtkWidget * pWindow;
|
GtkWidget * pWindow;
|
||||||
GtkWidget * pDrawingArea;
|
GtkWidget * pDrawingArea;
|
||||||
GtkWidget * pDrawingArea2;
|
GtkWidget * pDrawingArea2;
|
||||||
GladeXML * xml;
|
GladeXML * xml, * xml_tools;
|
||||||
|
|
||||||
/* callbacks_IO.c */
|
/* callbacks_IO.c */
|
||||||
void edit_controls();
|
void edit_controls();
|
||||||
|
|
|
@ -2,12 +2,13 @@
|
||||||
|
|
||||||
#include "callbacks.h"
|
#include "callbacks.h"
|
||||||
#include "callbacks_IO.h"
|
#include "callbacks_IO.h"
|
||||||
|
#include "dtools/callbacks_dtools.h"
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
|
||||||
GtkWidget * pWindow;
|
GtkWidget * pWindow;
|
||||||
GtkWidget * pDrawingArea;
|
GtkWidget * pDrawingArea;
|
||||||
GtkWidget * pDrawingArea2;
|
GtkWidget * pDrawingArea2;
|
||||||
GladeXML * xml;
|
GladeXML * xml, * xml_tools;
|
||||||
|
|
||||||
SoundInterface_struct *SNDCoreList[] = {
|
SoundInterface_struct *SNDCoreList[] = {
|
||||||
&SNDDummy,
|
&SNDDummy,
|
||||||
|
@ -141,13 +142,15 @@ int main(int argc, char *argv[]) {
|
||||||
Read_ConfigFile();
|
Read_ConfigFile();
|
||||||
|
|
||||||
/* load the interface */
|
/* load the interface */
|
||||||
xml = glade_xml_new("DeSmuMe.glade", NULL, NULL);
|
xml = glade_xml_new("glade/DeSmuMe.glade", NULL, NULL);
|
||||||
|
xml_tools = glade_xml_new("glade/DeSmuMe_Dtools.glade", NULL, NULL);
|
||||||
pWindow = glade_xml_get_widget(xml, "wMainW");
|
pWindow = glade_xml_get_widget(xml, "wMainW");
|
||||||
pDrawingArea = glade_xml_get_widget(xml, "wDraw_Main");
|
pDrawingArea = glade_xml_get_widget(xml, "wDraw_Main");
|
||||||
pDrawingArea2 = glade_xml_get_widget(xml, "wDraw_Sub");
|
pDrawingArea2 = glade_xml_get_widget(xml, "wDraw_Sub");
|
||||||
|
|
||||||
/* connect the signals in the interface */
|
/* connect the signals in the interface */
|
||||||
glade_xml_signal_autoconnect(xml);
|
glade_xml_signal_autoconnect(xml);
|
||||||
|
glade_xml_signal_autoconnect(xml_tools);
|
||||||
|
|
||||||
/* Vérifie la ligne de commandes */
|
/* Vérifie la ligne de commandes */
|
||||||
if(commandLine_File) {
|
if(commandLine_File) {
|
||||||
|
|
Loading…
Reference in New Issue