diff --git a/desmume/po/PACKAGE b/desmume/po/PACKAGE index cfd31b9fd..26555512a 100644 --- a/desmume/po/PACKAGE +++ b/desmume/po/PACKAGE @@ -2,7 +2,7 @@ # Add more languages here! Beware that this is a makefile snippet and # you have to adhere to make syntax. -LINGUAS = fr +LINGUAS = fr pt_BR sv # Textdomain for our package. diff --git a/desmume/po/POTFILES.in b/desmume/po/POTFILES.in index 15a72340d..dbd4b07bd 100644 --- a/desmume/po/POTFILES.in +++ b/desmume/po/POTFILES.in @@ -1,8 +1,8 @@ [encoding: UTF-8] -src/gtk-glade/callbacks.c -src/gtk-glade/gdk_3Demu.c -src/gtk-glade/glade-xml.c -src/gtk-glade/keyval_names.c -src/gtk-glade/main.c +src/gtk-glade/callbacks.cpp +src/gtk-glade/gdk_3Demu.cpp +src/gtk-glade/glade-xml.cpp +src/gtk-glade/keyval_names.cpp +src/gtk-glade/main.cpp src/gtk-glade/glade/DeSmuMe.glade src/gtk-glade/glade/DeSmuMe_Dtools.glade diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am index ab9cfc7f9..7d0dbea12 100644 --- a/desmume/src/Makefile.am +++ b/desmume/src/Makefile.am @@ -32,9 +32,11 @@ libdesmume_a_SOURCES = \ saves.cpp saves.h \ SPU.cpp SPU.h \ softrender.cpp softrender.h softrender_config.h \ + softrender_v3sysfont.h softrender_desmumefont.h \ matrix.cpp matrix.h \ gfx3d.cpp gfx3d.h \ - thumb_instructions.cpp thumb_instructions.h types.h + thumb_instructions.cpp thumb_instructions.h types.h \ + zero_private.h shaders.h if HAVE_GDB_STUB libdesmume_a_SOURCES += gdbstub.h endif diff --git a/desmume/src/cocoa/Makefile.am b/desmume/src/cocoa/Makefile.am index dc4c75290..fd3bbb3c8 100644 --- a/desmume/src/cocoa/Makefile.am +++ b/desmume/src/cocoa/Makefile.am @@ -1,7 +1,8 @@ -EXTRA_DIST = cocoa_util.m DeSmuME.cbp globals.h main.m main_window.h main_window.m nds_control.h nds_control.m preferences.m \ - about.m DeSmuME.icns English.strings Info.plist InfoPlist.strings input.h input.m \ - Japanese.strings makeapp.sh PkgInfo preferences.h rom_info.h rom_info.m screenshot.h screenshot.m \ - sndOSX.h sndOSX.mm video_output_view.h video_output_view.m \ - DeSmuME.xcodeproj/project.pbxproj \ - English.nib/classes.nib English.nib/info.nib English.nib/keyedobjects.nib \ - Japanese.nib/classes.nib Japanese.nib/info.nib Japanese.nib/keyedobjects.nib +EXTRA_DIST = cocoa_util.m DeSmuME.cbp globals.h main.m main_window.h main_window.m nds_control.h nds_control.mm preferences.m \ + about.m DeSmuME.icns Info.plist InfoPlist.strings input.h input.m \ + makeapp.sh PkgInfo preferences.h screenshot.h screenshot.m \ + screen_state.h screen_state.m sndOSX.h sndOSX.mm video_output_view.h video_output_view.m \ + DeSmuME.xcodeproj/project.pbxproj Rakefile \ + English.strings English.nib/classes.nib English.nib/info.nib English.nib/keyedobjects.nib \ + French.strings French.nib/classes.nib French.nib/info.nib French.nib/keyedobjects.nib \ + Japanese.strings Japanese.nib/classes.nib Japanese.nib/info.nib Japanese.nib/keyedobjects.nib diff --git a/desmume/src/windows/fs-windows.cpp b/desmume/src/fs-windows.cpp similarity index 100% rename from desmume/src/windows/fs-windows.cpp rename to desmume/src/fs-windows.cpp diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am index 62fdcad56..e4671e503 100644 --- a/desmume/src/gtk-glade/Makefile.am +++ b/desmume/src/gtk-glade/Makefile.am @@ -19,7 +19,7 @@ desmume_glade_SOURCES = \ globals.h glade-xml.cpp \ callbacks.cpp callbacks.h callbacks_IO.cpp callbacks_IO.h \ desmume.cpp desmume.h \ - keyval_names.cpp main.cpp gdk_gl.cpp gdk_gl.h \ + keyval_names.cpp keyval_names.h main.cpp gdk_gl.cpp gdk_gl.h \ dTools/callbacks_1_ioregs.cpp dTools/callbacks_2_memview.cpp \ dTools/callbacks_3_palview.cpp dTools/callbacks_4_tileview.cpp \ dTools/callbacks_dtools.h \ diff --git a/desmume/src/gtk/gtk-compat.cpp b/desmume/src/gtk/gtk-compat.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/desmume/src/gtk/gtk-compat.h b/desmume/src/gtk/gtk-compat.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/desmume/src/windows/Makefile.am b/desmume/src/windows/Makefile.am index 6794d6cc6..468a1af22 100644 --- a/desmume/src/windows/Makefile.am +++ b/desmume/src/windows/Makefile.am @@ -1,28 +1,26 @@ include $(top_srcdir)/src/desmume.mk -EXTRA_DIST = DeSmuME.dev DeSmuME.exe.Manifest DeSmuME.ico \ - DeSmuME.layout DeSmuME.vcproj Makefile.win \ - resources.rc yopyop_private.rc +EXTRA_DIST = DeSmuME.dev DeSmuME.ico \ + DeSmuME.layout Makefile.win \ + resources.rc bin_PROGRAMS = desmume desmume_SOURCES = \ - CWindow.c CWindow.h \ - disView.c disView.h ginfo.c ginfo.h \ - IORegView.c IORegView.h \ - main.c mapView.c mapView.h memView.c memView.h \ - oamView.c oamView.h palView.c palView.h \ + CWindow.cpp CWindow.h \ + disView.cpp disView.h ginfo.cpp ginfo.h \ + IORegView.cpp IORegView.h \ + main.cpp mapView.cpp mapView.h memView.cpp memView.h \ + oamView.cpp oamView.h palView.cpp palView.h \ resource.h \ - snddx.c snddx.h \ - tileView.c tileView.h yopyop_private.h \ - ConfigKeys.c ConfigKeys.h \ - FirmConfig.c FirmConfig.h \ - OGLRender.c OGLRender.h \ - AboutBox.c AboutBox.h \ - colorconv.h colorctrl.c colorctrl.h \ - lightView.c lightView.h \ - matrixView.c matrixView.h + snddx.cpp snddx.h \ + tileView.cpp tileView.h \ + FirmConfig.cpp FirmConfig.h \ + AboutBox.cpp AboutBox.h \ + colorctrl.cpp colorctrl.h \ + lightView.cpp lightView.h \ + matrixView.cpp matrixView.h desmume_LDADD = ../libdesmume.a yopyop_private.o if HAVE_GDB_STUB desmume_LDADD += ../gdbstub/libgdbstub.a endif -yopyop_private.o: yopyop_private.rc resources.rc resource.h - windres yopyop_private.rc -o yopyop_private.o +yopyop_private.o: resources.rc resource.h + windres resources.rc -o resources.o