Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Updated SDL (so tco.xml wont load from vbampb folder)

  • Loading branch information...
commit 17631707336387266ae1522d22bb21f331978712 1 parent 8864bee
Justin Tokarchuk authored May 04, 2012
3  .cproject
@@ -147,9 +147,10 @@
147 147
 								<option id="com.qnx.qcc.option.linker.security.258666952" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
148 148
 								<option id="com.qnx.qcc.option.linker.pie.751354641" name="Position Independent Executable (-pie)" superClass="com.qnx.qcc.option.linker.pie" value="true" valueType="boolean"/>
149 149
 								<option id="com.qnx.qcc.option.linker.libraryPaths.1991575573" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
  150
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SDL12/Device-Release}&quot;"/>
  151
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/TouchControlOverlay/Device-Release}&quot;"/>
150 152
 									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/lib"/>
151 153
 									<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/${CPUVARDIR}/usr/lib"/>
152  
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/GBColor-PB/3rdparty/libs}&quot;"/>
153 154
 								</option>
154 155
 								<option id="com.qnx.qcc.option.linker.profile2.1717901882" name="Build for Profiling (Function Instrumentation) (-lprofiling)" superClass="com.qnx.qcc.option.linker.profile2" value="false" valueType="boolean"/>
155 156
 								<option id="com.qnx.qcc.option.linker.debug.1813827308" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="false" valueType="boolean"/>
1  README
... ...
@@ -0,0 +1 @@
  1
+VBAMpb Blackberry Port of VBA-M GBA/GB/GBC emulator
18  README.md
Source Rendered
... ...
@@ -1,9 +1,17 @@
1  
-GBColor-PB Blackberry Port of VBA-M GBA/GB/GBC emulator (GBC Only)
  1
+VBAMpb Blackberry Port of VBA-M GBA/GB/GBC emulator
2 2
 
3  
-misc\gbcolor-pb\roms        place unzipped .gbc/.gb games in here                   
4  
-misc\gbcolor-pb\         configuration, saves and other stuff.
5  
-misc\gbcolor-pb\tco.xml  override default control interface with your own buttons and layout
  3
+misc\roms\gba        place unzipped .gba games in here
  4
+                     place gba_bios.bin file here if you wish to play games...
  5
+misc\vbampb\         configuration, saves and other stuff.
  6
+misc\vbampb\tco.xml  override default control interface with your own buttons and layout
6 7
 
7 8
 
8 9
 
9  
-v1.0.0.1
  10
+v1.0.0.5
  11
+
  12
+- rom cycling, tap top left
  13
+- FEX is disabled for now, so no zip etc
  14
+- effects are disabled for now like blur etc but not the main filters 
  15
+- audio buffer is 300ms/11khz for now... 
  16
+- Some games stutter with sound, performance issues vary wildly but for
  17
+  the most part they are playable.
6  bar-descriptor.xml
@@ -19,7 +19,7 @@
19 19
          Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
20 20
          An updated version of application must have a versionNumber value higher than the previous version. Required. -->
21 21
     <versionNumber>1.0.0</versionNumber>
22  
-    <buildId>1</buildId>
  22
+    <buildId>2</buildId>
23 23
 
24 24
     <!-- Fourth digit segment of the package version. First three segments are taken from the 
25 25
          <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->
@@ -74,8 +74,6 @@
74 74
        <asset path="Simulator-Coverage/GBColor-PB" entry="true" type="Qnx/Elf">GBColor-PB</asset>
75 75
     </configuration>
76 76
     <asset path="sdl-controls.xml">sdl-controls.xml</asset>
77  
-    <asset path="3rdparty/libs/libSDL12.so" type="Qnx/Elf">lib/libSDL12.so</asset>
78  
-    <asset path="3rdparty/libs/libTouchControlOverlay.so" type="Qnx/Elf">lib/libTouchControlOverlay.so</asset>
79 77
     <asset path="media/gba-icon.png.png">gba-icon.png.png</asset>
80 78
     <asset path="media/gba_A.png">gba_A.png</asset>
81 79
     <asset path="media/gba_B.png">gba_B.png</asset>
@@ -83,6 +81,8 @@
83 81
     <asset path="media/gba_dpad.png">gba_dpad.png</asset>
84 82
     <asset path="media/select-button.png">select-button.png</asset>
85 83
     <asset path="media/icon.png">icon.png</asset>
  84
+    <asset path="3rdparty/libs/libSDL12.so" type="Qnx/Elf">lib/libSDL12.so</asset>
  85
+    <asset path="3rdparty/libs/libTouchControlOverlay.so" type="Qnx/Elf">lib/libTouchControlOverlay.so</asset>
86 86
     
87 87
     <!--  The icon for the application, which should be 86x86. -->
88 88
     
71  changes.txt
... ...
@@ -0,0 +1,71 @@
  1
+File_Extractor Change Log
  2
+-------------------------
  3
+- Change that might break code.
  4
++ Improvement that is unlikely to break any code.
  5
+* Other changes.
  6
+
  7
+
  8
+File_Extractor 1.0.0 (2009-10-12)
  9
+--------------------
  10
+- Added fex_stat() which MUST be called before getting current file
  11
+information beyond name, like fex_size().
  12
+
  13
+- Changed fex_*() functions to always report error via return value,
  14
+rather than sometimes via a parameter. This will break user code that
  15
+uses fex_data(), fex_open(), fex_open_type(), and fex_identify_file().
  16
+See demos for usage.
  17
+
  18
+- Deprecated C++ interface. Use fex.h and nothing else to access library
  19
+from user code.
  20
+
  21
+- Removed archive types (fex_zip_type, etc.) from interface. Use
  22
+fex_identify_extension() to get particular type.
  23
+
  24
+- Removed fex_mini.c, unzip.h, and unrarlib.h for now, as maintaining
  25
+them was too taxing. If others express desire for them, I can re-add
  26
+them.
  27
+
  28
+- Removed fex_scan_only() and fex_read_once(), as they don't improve
  29
+performance anymore. Use fex_read() in place of fex_read_once().
  30
+
  31
+- Removed fex_remain(). Use fex_size()-fex_tell() to find number of
  32
+bytes remaining.
  33
+
  34
+- Removed fex_set_user_data() and related functions, as they didn't seem
  35
+useful to anyone.
  36
+
  37
+- Removed fex_type_t structure from interface and added accessors
  38
+instead (fex_type_name(), fex_type_extension()).
  39
+
  40
++ Improved archive file type determination to reject other archive types
  41
+not handled by the library, rather than opening them as binary files.
  42
+
  43
++ Added Doxygen compatibility to fex.h.
  44
+
  45
++ Added fex_crc32() to quickly get CRC-32 of current file from archive
  46
+header, without having to read entire file to calculate it.
  47
+
  48
++ Added fex_err_code() to get numeric error code, along with other
  49
+helpful error-related functions. Also added more documentation on how to
  50
+handle library errors in user code. 
  51
+
  52
++ Added fex_init() for use in multi-threaded programs.
  53
+
  54
++ Added fex_seek_arc() to seek to particular file in archive.
  55
+
  56
++ Added fex_wname() to get Unicode name of current file.
  57
+
  58
++ Added support for building as DLL.
  59
+
  60
++ Added support for wide-character file paths on Windows, enabled with
  61
+BLARGG_UTF8_PATHS (thanks to byuu for the idea). This is necessary to
  62
+support file paths on non-English Windows systems.
  63
+
  64
++ Started using unit testing during development.
  65
+
  66
++ Updated to 7-zip 4.65, unrar_core 3.8.5.
  67
+
  68
+
  69
+File_Extractor 0.4.3 (2008-12-08)
  70
+--------------------
  71
+* Limited release
330  fex.txt
... ...
@@ -0,0 +1,330 @@
  1
+File_Extractor 1.0.0
  2
+--------------------
  3
+Author  : Shay Green <gblargg@gmail.com>
  4
+Website : http://code.google.com/p/file-extractor/
  5
+License : GNU LGPL 2.1 or later for all except unrar
  6
+Language: C interface, C++ implementation
  7
+
  8
+
  9
+Contents
  10
+--------
  11
+* Overview
  12
+* Limitations
  13
+* Extracting file data
  14
+* Archive file type handling
  15
+* Using in multiple threads
  16
+* Error handling
  17
+* Solving problems
  18
+* Thanks
  19
+
  20
+
  21
+Overview
  22
+--------
  23
+File_Exactor (fex) allows you to write one version of file-opening code
  24
+that handles normal files and archives of files. It presents each as a
  25
+series of files that you can scan and optionally extract; a single file
  26
+is made to act like an archive of just one file, so your code doesn't
  27
+need to do anything special to handle it.
  28
+
  29
+Basic steps for scanning and extracting from an archive:
  30
+
  31
+	* Open an archive or normal file using fex_open().
  32
+	* Scanning/extraction loop:
  33
+		- Exit loop if fex_done() returns true.
  34
+		- Get current file's name with fex_name().
  35
+		- If more file information is needed, call fex_stat() first.
  36
+		- If extracting, use fex_data() or fex_read().
  37
+		- Go to next file in archive with fex_next().
  38
+	* Close archive and free memory with fex_close().
  39
+
  40
+You can stop scanning an archive at any point, for example once you've
  41
+found the file you're looking for. If you need to go back to the first
  42
+file, call fex_rewind() at any time. Be sure to check error codes
  43
+returned by most functions.
  44
+
  45
+
  46
+Limitations
  47
+-----------
  48
+All archives:
  49
+* A file's checksum is verified only after ALL its data is extracted.
  50
+* Encryption, segmentation, files larger than 2GB, and other extra
  51
+features are not supported.
  52
+
  53
+GZ archives:
  54
+* Only gzip archives of a single file are supported. If it has multiple
  55
+files, the reported size will be wrong. Multi-file gzip archives are
  56
+very rare.
  57
+
  58
+ZIP archives:
  59
+* Supports files compressed using either deflation or store
  60
+(uncompressed). Other compression schemes like BZip2 and Deflate64 are
  61
+not supported.
  62
+* Archive must have a valid directory structure at the end.
  63
+
  64
+RAR archives:
  65
+* Support for really old 1.x archives might not work. If you have some
  66
+of these old archives, send them to me so I can test them.
  67
+
  68
+7-zip:
  69
+* Solid archives can currently use lots of memory when open.
  70
+
  71
+
  72
+Extracting file data
  73
+--------------------
  74
+A file's data can be extracted with one or more calls to fex_read(), as
  75
+you would read from a normal file. Use fex_tell() to find out how much
  76
+has already been read. Use this if you need the data read into your own
  77
+structure in memory.
  78
+
  79
+File data can also be extracted to memory by the library with
  80
+fex_data(). The pointer returned is valid only until you go to another
  81
+file or close the archive, so this is only useful if you need to examine
  82
+or process the data immediately and not keep it around for later.
  83
+Archive extractors naturally keep a copy of the extracted data in memory
  84
+already for solid archive types (currently 7-zip and RAR), so this
  85
+function is optimized to avoid making a second copy of it in those
  86
+cases.
  87
+
  88
+Use fex_size() to find the size of the extracted data. Remember that
  89
+fex_stat() or fex_data() must be called BEFORE calling fex_size().
  90
+
  91
+
  92
+Archive file type handling
  93
+--------------------------
  94
+By default, fex uses the filename extension and header to determine
  95
+archive type. If the filename extension is unrecognized or it lacks an
  96
+extension, fex examines the first few bytes of the file. If still
  97
+unrecognized, fex opens it as binary. Fex also checks for common archive
  98
+types that it doesn't support, so that it can reject as unsupported them
  99
+rather than unhelpfully opening them as binary.
  100
+
  101
+Your file format might itself be an archive, for example your files end
  102
+in ".rsn" yet are normal RAR archives, or they end in ".vgz" and are
  103
+gzipped. This is why fex checks the headers of files with unknown
  104
+filename extensions, rather than treating them as binary or rejecting
  105
+them.
  106
+
  107
+Type identification can be customized by using the various
  108
+identification functions and fex_open_type(). For example, you could
  109
+avoid the header check:
  110
+
  111
+	fex_t* fex;
  112
+	fex_type_t type = fex_identify_extension( path );
  113
+	if ( type == NULL )
  114
+		error( "Unsupported archive type" );
  115
+	
  116
+	error( fex_open_type( &fex, path, type ) );
  117
+	
  118
+Note that you'll only get a NULL type for known archive type that fex
  119
+doesn't handle; you won't get it for your own files, for example
  120
+fex_identify_extension("myfile.foo") won't return NULL (unless for some
  121
+reason you've disabled binary file support).
  122
+
  123
+Use fex_type_list() to get a list of the types fex supports, for example
  124
+to tell the user what archive types your program supports:
  125
+
  126
+	const fex_type_t* t;
  127
+	for ( t = fex_type_list(); *t; t++ )
  128
+		printf( "%s\n", fex_type_name( *t ) );
  129
+
  130
+To get the fex_type_t for a particular archive type, use
  131
+fex_identify_extension():
  132
+
  133
+	fex_type_t zip_type = fex_identify_extension( ".zip" );
  134
+	if ( zip_type == NULL )
  135
+		error( "ZIP isn't supported" );
  136
+
  137
+Be sure to check the result as shown, rather than assuming the library
  138
+supports a particular archive type. Use an extension of "" to get the
  139
+type for binary files:
  140
+
  141
+	fex_type_t bin_type = fex_identify_extension( "" );
  142
+	if ( bin_type == NULL )
  143
+		error( "Binary files aren't supported?!?" );
  144
+
  145
+
  146
+Using in multiple threads
  147
+-------------------------
  148
+Fex supports multi-threaded programs. If only one thread at a time is
  149
+using the library, nothing special needs to be done. If more than one
  150
+thread is using the library, the following must be done:
  151
+
  152
+* Call fex_init() from the main thread and ensure it completes before
  153
+any other threads use any fex functions. This initializes shared data
  154
+tables used by the extractors.
  155
+
  156
+* For each archive opened, only access it from one thread at a time.
  157
+Different archives can be accessed from different threads without any
  158
+synchronization, since fex uses no global variables. If the same archive
  159
+must be accessed from multiple threads, all calls to any fex functions
  160
+must be in critical section(s).
  161
+
  162
+
  163
+Unicode file paths on Windows
  164
+-----------------------------
  165
+If using Windows and your program supports Unicode file paths, enable
  166
+BLARGG_UTF8_PATHS in blargg_config.h, and convert your wide-character
  167
+paths to UTF-8 before passing them to fex.h functions:
  168
+
  169
+	/* Wide-character path that could have come from system */
  170
+	wchar_t wide_path [] = L"demo.zip";
  171
+	
  172
+	/* Convert from wide path and check for error */
  173
+	char* path = fex_wide_to_path( wide_path );
  174
+	if ( path == NULL )
  175
+		error( "Out of memory" );
  176
+	
  177
+	/* Use converted path for fex call */
  178
+	error( fex_open( &fex, path ) );
  179
+	
  180
+	/* Free memory used by path */
  181
+	fex_free_path( path );
  182
+
  183
+The converted path can be used with any of the fex functions that take
  184
+paths, for example fex_identify_extension() or fex_has_extension().
  185
+
  186
+
  187
+Error handling
  188
+--------------
  189
+Most functions that can fail return fex_err_t, a pointer type. On
  190
+failure they return a pointer to an error object, and on success they
  191
+return NULL. Use fex_err_code() to get a conventional error code, or
  192
+fex_err_str() to get a string suitable for reporting to the user.
  193
+
  194
+There are two basic approches that your code can use to handle library
  195
+errors. It can return errors, or report them and exit the function via
  196
+some other means.
  197
+
  198
+Your code can return errors as the library does, using fex_err_t:
  199
+
  200
+	#define RETURN_ERR( expr ) \
  201
+		do {\
  202
+			fex_err_t err = (expr);\
  203
+			if ( err != NULL )\
  204
+				return err;\
  205
+		} while ( 0 )
  206
+	
  207
+	fex_err_t my_func()
  208
+	{
  209
+		RETURN_ERR( fex_foo() );
  210
+		RETURN_ERR( fex_bar() );
  211
+		return NULL;
  212
+	}
  213
+
  214
+If you have your own error codes, you can convert fex's errors to them:
  215
+
  216
+	// error codes that differ from library's
  217
+	enum {
  218
+		my_ok             = 0,
  219
+		my_generic_error  = 123,
  220
+		my_out_of_memory  = 456,
  221
+		my_file_not_found = 789
  222
+		// ...
  223
+	};
  224
+	
  225
+	int convert_error( fex_err_t err )
  226
+	{
  227
+		switch ( fex_err_code( err ) )
  228
+		{
  229
+		case fex_ok:               return my_ok;
  230
+		case fex_err_generic:      return my_generic_error;
  231
+		case fex_err_memory:       return my_out_of_memory;
  232
+		case fex_err_file_missing: return my_file_not_found;
  233
+		// ...
  234
+		default:                   return my_generic_error;
  235
+		}
  236
+	}
  237
+	
  238
+	#define RETURN_ERR( expr ) \
  239
+		do {\
  240
+			fex_err_t err = (expr);\
  241
+			if ( err != NULL )\
  242
+				return convert_error( err );\
  243
+		} while ( 0 )
  244
+	
  245
+	int my_func()
  246
+	{
  247
+		RETURN_ERR( fex_foo() );
  248
+		RETURN_ERR( fex_bar() );
  249
+		return my_ok;
  250
+	}
  251
+
  252
+The other approach is to pass all errors to an error handler function
  253
+that never returns if passed a non-success error value:
  254
+
  255
+	// never returns if err != NULL
  256
+	void handle_error( fex_err_t err );
  257
+	
  258
+	void my_func()
  259
+	{
  260
+		handle_error( fex_foo() );
  261
+		handle_error( fex_bar() );
  262
+	}
  263
+
  264
+handle_error() could print the error and exit the program:
  265
+
  266
+	void handle_error( fex_err_t err )
  267
+	{
  268
+		if ( err != NULL )
  269
+		{
  270
+			const char* str = fex_err_str( err );
  271
+			printf( "Error: %s\n", str );
  272
+			exit( EXIT_FAILURE );
  273
+		}
  274
+	}
  275
+
  276
+handle_error() could also throw a C++ exception (or equivalently in C,
  277
+longmp() back to a setjmp() done inside caller()):
  278
+
  279
+	void handle_error( fex_err_t err )
  280
+	{
  281
+		switch ( fex_err_code( err ) )
  282
+		{
  283
+		case fex_ok:          return;
  284
+		case fex_err_memory:  throw std::bad_alloc();
  285
+		// ...
  286
+		case fex_err_generic:
  287
+		default:
  288
+			throw std::runtime_error( fex_err_str( err ) );
  289
+		}
  290
+	}
  291
+	
  292
+	void caller()
  293
+	{
  294
+		try
  295
+		{
  296
+			my_func();
  297
+		}
  298
+		catch ( const std::exception& e )
  299
+		{
  300
+			printf( "Error: %s\n", e.what() );
  301
+		}
  302
+	}
  303
+
  304
+
  305
+Solving problems
  306
+----------------
  307
+If you're having problems, try the following:
  308
+
  309
+* Enable debugging support in your environment. This enables assertions
  310
+and other run-time checks. In particular, be sure NDEBUG isn't defined.
  311
+
  312
+* Turn the compiler's optimizer is off. Sometimes an optimizer generates
  313
+bad code.
  314
+
  315
+* If multiple threads are being used, ensure that only one at a time is
  316
+accessing a given set of objects from the library. This library is not
  317
+in general thread-safe, though independent objects can be used in
  318
+separate threads.
  319
+
  320
+* If all else fails, see if the demo works.
  321
+
  322
+
  323
+Thanks
  324
+------
  325
+Thanks to Richard Bannister, Kode54, byuu, Cless, and DJRobX for testing
  326
+and giving feedback for the library. Thanks to the authors of zlib,
  327
+unrar, and 7-zip.
  328
+
  329
+-- 
  330
+Shay Green <gblargg@gmail.com>
59  readme-fex.txt
... ...
@@ -0,0 +1,59 @@
  1
+File_Extractor 1.0.0
  2
+--------------------
  3
+File_Extractor is a modular archive scanning and extraction library that
  4
+supports several popular compressed file formats. It gives a common
  5
+interface to the supported formats, allowing one version of user code.
  6
+
  7
+Features:
  8
+* Simple C interface.
  9
+* Supports ZIP, GZIP, 7-Zip (7Z), and RAR[1] archive formats.
  10
+* Non-archive files act like archive of that one file, simplifying code.
  11
+* Modular design allows removal of support for unneeded archive formats.
  12
+* Optionally supports wide-character paths on Windows.
  13
+* Archive file type identification can be customized
  14
+
  15
+[1] RAR support must be enabled before use, due to its special
  16
+licensing.
  17
+
  18
+Author  : Shay Green <gblargg@gmail.com>
  19
+Website : http://code.google.com/p/file-extractor/
  20
+License : GNU LGPL 2.1 or later for all except unrar
  21
+Language: C interface, C++ implementation
  22
+
  23
+
  24
+Getting Started
  25
+---------------
  26
+Build the demo by typing "make" at the command-line. If that doesn't
  27
+work, manually build a program from demo.c and all *.c and *.cpp files
  28
+in fex/, 7z_C/, and zlib/. Run demo with test.zip in the same directory.
  29
+
  30
+To enable RAR archive support, edit fex/blargg_config.h.
  31
+
  32
+See fex.h for reference and fex.txt for documentation.
  33
+
  34
+
  35
+Files
  36
+-----
  37
+fex.txt                 Manual
  38
+license.txt             GNU LGPL 2.1 license
  39
+
  40
+makefile                Builds libfex.a and demo
  41
+
  42
+demo.c                  Basic usage
  43
+demo_read.c             Uses fex_read() to extract data
  44
+demo_rewind.c           Uses fex_rewind() to re-scan archive
  45
+demo_seek.c             Uses fex_seek_arc() to go back to files
  46
+demo_directory.c        Recursively scans directory for archives
  47
+demo.zip                Test archive used by demos
  48
+
  49
+fex/
  50
+  blargg_config.h       Configuration (modify as needed)
  51
+  fex.h                 C interface (also usable from C++)
  52
+  (all other files)     Library sources
  53
+
  54
+zlib/                   Zip/Gzip (can use your system's instead)
  55
+7z_C/                   7-Zip
  56
+unrar/                  RAR
  57
+
  58
+-- 
  59
+Shay Green <gblargg@gmail.com>
59  readme.txt
... ...
@@ -0,0 +1,59 @@
  1
+File_Extractor 1.0.0
  2
+--------------------
  3
+File_Extractor is a modular archive scanning and extraction library that
  4
+supports several popular compressed file formats. It gives a common
  5
+interface to the supported formats, allowing one version of user code.
  6
+
  7
+Features:
  8
+* Simple C interface.
  9
+* Supports ZIP, GZIP, 7-Zip (7Z), and RAR[1] archive formats.
  10
+* Non-archive files act like archive of that one file, simplifying code.
  11
+* Modular design allows removal of support for unneeded archive formats.
  12
+* Optionally supports wide-character paths on Windows.
  13
+* Archive file type identification can be customized
  14
+
  15
+[1] RAR support must be enabled before use, due to its special
  16
+licensing.
  17
+
  18
+Author  : Shay Green <gblargg@gmail.com>
  19
+Website : http://code.google.com/p/file-extractor/
  20
+License : GNU LGPL 2.1 or later for all except unrar
  21
+Language: C interface, C++ implementation
  22
+
  23
+
  24
+Getting Started
  25
+---------------
  26
+Build the demo by typing "make" at the command-line. If that doesn't
  27
+work, manually build a program from demo.c and all *.c and *.cpp files
  28
+in fex/, 7z_C/, and zlib/. Run demo with test.zip in the same directory.
  29
+
  30
+To enable RAR archive support, edit fex/blargg_config.h.
  31
+
  32
+See fex.h for reference and fex.txt for documentation.
  33
+
  34
+
  35
+Files
  36
+-----
  37
+fex.txt                 Manual
  38
+license.txt             GNU LGPL 2.1 license
  39
+
  40
+makefile                Builds libfex.a and demo
  41
+
  42
+demo.c                  Basic usage
  43
+demo_read.c             Uses fex_read() to extract data
  44
+demo_rewind.c           Uses fex_rewind() to re-scan archive
  45
+demo_seek.c             Uses fex_seek_arc() to go back to files
  46
+demo_directory.c        Recursively scans directory for archives
  47
+demo.zip                Test archive used by demos
  48
+
  49
+fex/
  50
+  blargg_config.h       Configuration (modify as needed)
  51
+  fex.h                 C interface (also usable from C++)
  52
+  (all other files)     Library sources
  53
+
  54
+zlib/                   Zip/Gzip (can use your system's instead)
  55
+7z_C/                   7-Zip
  56
+unrar/                  RAR
  57
+
  58
+-- 
  59
+Shay Green <gblargg@gmail.com>
6  src/sdl/SDL.cpp
@@ -1573,14 +1573,14 @@ void sdlInitVideo() {
1573 1573
  //  destHeight =  srcHeight;
1574 1574
 
1575 1575
 #ifndef __QNXNTO__
1576  
-  flags = SDL_ANYFORMAT | (fullscreen ? SDL_FULLSCREEN : 0);
  1576
+  flags = SDL_ANYFORMAT | (fullscreen ? SDL_FULLSCREEN : 1);
1577 1577
   if(openGL) {
1578 1578
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
1579 1579
     flags |= SDL_OPENGL | SDL_RESIZABLE;
1580 1580
   } else
1581 1581
     flags |= SDL_HWSURFACE | SDL_DOUBLEBUF;
1582 1582
 
1583  
-  if (fullscreen && openGL) {
  1583
+  if (fullscreen) {
1584 1584
     screenWidth = desktopWidth;
1585 1585
     screenHeight = desktopHeight;
1586 1586
   } else {
@@ -1830,7 +1830,7 @@ void sdlPollEvents()
1830 1830
     case SDL_MOUSEMOTION:
1831 1831
     case SDL_MOUSEBUTTONUP:
1832 1832
     case SDL_MOUSEBUTTONDOWN:
1833  
-      if(fullscreen) {
  1833
+      if(fullscreen && opengl) {
1834 1834
         SDL_ShowCursor(SDL_ENABLE);
1835 1835
         mouseCounter = 120;
1836 1836
       }

0 notes on commit 1763170

Please sign in to comment.
Something went wrong with that request. Please try again.