Menu
▾
▴
[Desmume-cvs] SF.net SVN: desmume:[1191] trunk/desmume
|
From: <ya...@us...> - 2008-12-08 21:57:08
|
Revision: 1191
http://desmume.svn.sourceforge.net/desmume/?rev=1191&view=rev
Author: yabause
Date: 2008-12-08 21:57:05 +0000 (Mon, 08 Dec 2008)
Log Message:
-----------
Started to fix "make dist" as we should release sometime soon.
This commit broke the visual studio compilation as I moved
fs-windows.cpp back in "src".
I also removed some old files from gtk dir.
Modified Paths:
--------------
trunk/desmume/po/PACKAGE
trunk/desmume/po/POTFILES.in
trunk/desmume/src/Makefile.am
trunk/desmume/src/cocoa/Makefile.am
trunk/desmume/src/gtk-glade/Makefile.am
trunk/desmume/src/windows/Makefile.am
Added Paths:
-----------
trunk/desmume/src/fs-windows.cpp
Removed Paths:
-------------
trunk/desmume/src/gtk/gtk-compat.cpp
trunk/desmume/src/gtk/gtk-compat.h
trunk/desmume/src/windows/fs-windows.cpp
Modified: trunk/desmume/po/PACKAGE
===================================================================
--- trunk/desmume/po/PACKAGE 2008-12-08 20:27:09 UTC (rev 1190)
+++ trunk/desmume/po/PACKAGE 2008-12-08 21:57:05 UTC (rev 1191)
@@ -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.
Modified: trunk/desmume/po/POTFILES.in
===================================================================
--- trunk/desmume/po/POTFILES.in 2008-12-08 20:27:09 UTC (rev 1190)
+++ trunk/desmume/po/POTFILES.in 2008-12-08 21:57:05 UTC (rev 1191)
@@ -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
Modified: trunk/desmume/src/Makefile.am
===================================================================
--- trunk/desmume/src/Makefile.am 2008-12-08 20:27:09 UTC (rev 1190)
+++ trunk/desmume/src/Makefile.am 2008-12-08 21:57:05 UTC (rev 1191)
@@ -32,9 +32,11 @@
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
Modified: trunk/desmume/src/cocoa/Makefile.am
===================================================================
--- trunk/desmume/src/cocoa/Makefile.am 2008-12-08 20:27:09 UTC (rev 1190)
+++ trunk/desmume/src/cocoa/Makefile.am 2008-12-08 21:57:05 UTC (rev 1191)
@@ -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
Copied: trunk/desmume/src/fs-windows.cpp (from rev 1190, trunk/desmume/src/windows/fs-windows.cpp)
===================================================================
--- trunk/desmume/src/fs-windows.cpp (rev 0)
+++ trunk/desmume/src/fs-windows.cpp 2008-12-08 21:57:05 UTC (rev 1191)
@@ -0,0 +1,90 @@
+/* Copyright (C) 2006 Guillaume Duhamel
+
+ This file is part of DeSmuME
+
+ DeSmuME is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ DeSmuME is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with DeSmuME; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
+
+#include "fs.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <windows.h>
+
+const char FS_SEPARATOR = '\\';
+
+void * FsReadFirst(const char * p, FsEntry * entry) {
+ WIN32_FIND_DATA FindFileData;
+ HANDLE hFind;
+ HANDLE * ret;
+ char path[1024];
+ if (strlen(p)+3 >sizeof(path)) return NULL ;
+
+ sprintf(path, "%s\\*", p);
+
+ hFind = FindFirstFile(path, &FindFileData);
+ if (hFind == INVALID_HANDLE_VALUE)
+ return NULL;
+
+ strncpy(entry->cFileName, FindFileData.cFileName,256);
+ entry->cFileName[255] = 0 ;
+ strncpy(entry->cAlternateFileName, FindFileData.cAlternateFileName,14);
+ entry->cAlternateFileName[13] = 0 ;
+ entry->flags = 0;
+ if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+ entry->flags = FS_IS_DIR;
+ entry->fileSize = 0;
+ } else {
+ entry->fileSize = FindFileData.nFileSizeLow;
+ }
+
+ ret = (void**)malloc(sizeof(HANDLE));
+ *ret = hFind;
+ return ret;
+}
+
+int FsReadNext(void * search, FsEntry * entry) {
+ WIN32_FIND_DATA FindFileData;
+ HANDLE * h = (HANDLE *) search;
+ int ret;
+
+ ret = FindNextFile(*h, &FindFileData);
+
+ strncpy(entry->cFileName, FindFileData.cFileName,256);
+ entry->cFileName[255] = 0 ;
+ strncpy(entry->cAlternateFileName, FindFileData.cAlternateFileName,14);
+ entry->cAlternateFileName[13] = 0 ;
+ entry->flags = 0;
+ if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+ entry->flags = FS_IS_DIR;
+ entry->fileSize = 0;
+ } else {
+ entry->fileSize = FindFileData.nFileSizeLow;
+ }
+
+ return ret;
+}
+
+void FsClose(void * search) {
+ FindClose(*((HANDLE *) search));
+}
+
+int FsError(void) {
+ if (GetLastError() == ERROR_NO_MORE_FILES)
+ return FS_ERR_NO_MORE_FILES;
+
+ return FS_ERR_UNKNOWN;
+}
Modified: trunk/desmume/src/gtk-glade/Makefile.am
===================================================================
--- trunk/desmume/src/gtk-glade/Makefile.am 2008-12-08 20:27:09 UTC (rev 1190)
+++ trunk/desmume/src/gtk-glade/Makefile.am 2008-12-08 21:57:05 UTC (rev 1191)
@@ -19,7 +19,7 @@
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 \
Modified: trunk/desmume/src/windows/Makefile.am
===================================================================
--- trunk/desmume/src/windows/Makefile.am 2008-12-08 20:27:09 UTC (rev 1190)
+++ trunk/desmume/src/windows/Makefile.am 2008-12-08 21:57:05 UTC (rev 1191)
@@ -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
Deleted: trunk/desmume/src/windows/fs-windows.cpp
===================================================================
--- trunk/desmume/src/windows/fs-windows.cpp 2008-12-08 20:27:09 UTC (rev 1190)
+++ trunk/desmume/src/windows/fs-windows.cpp 2008-12-08 21:57:05 UTC (rev 1191)
@@ -1,90 +0,0 @@
-/* Copyright (C) 2006 Guillaume Duhamel
-
- This file is part of DeSmuME
-
- DeSmuME is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- DeSmuME is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with DeSmuME; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-#include "fs.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <windows.h>
-
-const char FS_SEPARATOR = '\\';
-
-void * FsReadFirst(const char * p, FsEntry * entry) {
- WIN32_FIND_DATA FindFileData;
- HANDLE hFind;
- HANDLE * ret;
- char path[1024];
- if (strlen(p)+3 >sizeof(path)) return NULL ;
-
- sprintf(path, "%s\\*", p);
-
- hFind = FindFirstFile(path, &FindFileData);
- if (hFind == INVALID_HANDLE_VALUE)
- return NULL;
-
- strncpy(entry->cFileName, FindFileData.cFileName,256);
- entry->cFileName[255] = 0 ;
- strncpy(entry->cAlternateFileName, FindFileData.cAlternateFileName,14);
- entry->cAlternateFileName[13] = 0 ;
- entry->flags = 0;
- if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
- entry->flags = FS_IS_DIR;
- entry->fileSize = 0;
- } else {
- entry->fileSize = FindFileData.nFileSizeLow;
- }
-
- ret = (void**)malloc(sizeof(HANDLE));
- *ret = hFind;
- return ret;
-}
-
-int FsReadNext(void * search, FsEntry * entry) {
- WIN32_FIND_DATA FindFileData;
- HANDLE * h = (HANDLE *) search;
- int ret;
-
- ret = FindNextFile(*h, &FindFileData);
-
- strncpy(entry->cFileName, FindFileData.cFileName,256);
- entry->cFileName[255] = 0 ;
- strncpy(entry->cAlternateFileName, FindFileData.cAlternateFileName,14);
- entry->cAlternateFileName[13] = 0 ;
- entry->flags = 0;
- if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
- entry->flags = FS_IS_DIR;
- entry->fileSize = 0;
- } else {
- entry->fileSize = FindFileData.nFileSizeLow;
- }
-
- return ret;
-}
-
-void FsClose(void * search) {
- FindClose(*((HANDLE *) search));
-}
-
-int FsError(void) {
- if (GetLastError() == ERROR_NO_MORE_FILES)
- return FS_ERR_NO_MORE_FILES;
-
- return FS_ERR_UNKNOWN;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|