First pass at removing libpng support from the OSX build process. Of

course, I still can't test this until I find an OSX machine ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1149 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/src/macosx/READMEbuild.txt

@@ -4,28 +4,15 @@ README for Building StellaOSX
 StellaOSX is configured to be built using Xcode.  The project file for doing
 this is in this directory, named stella.pbproj.
 
-The project links the application with two external static libraries.  
+The project links the application with SDL, a static library.
 
-The first of these is SDL.  The project expects a copy of the SDL.Framework to
+The project expects a copy of the SDL.Framework to be present in the macosx
-be present in the macosx directory.  It will then link against this
+directory.  It will then link against this framework, and place a copy of the
-framework, and place a copy of the framework in the Application bundle. The
+framework in the Application bundle. The current version of the SDL framework
-current version of the SDL framework may be downloaded from www.libsdl.org. The
+may be downloaded from www.libsdl.org. The current release is linked against
-current release is linked against version 1.2.8 for MacOSX.  The SDL framework 
+version 1.2.8 for MacOSX.  The SDL framework may be located else where, but
-may be located else where, but the project include and copy framework settings 
+the project include and copy framework settings  would need to be changed.
-would need to be changed.
-
-The second library which the application is linked libpng.  The library source
-may be downloaded from http://www.libpng.org/pub/png/libpng.html.  I am
-currently using version 1.2.5.  The source will need to be built for MacOSX 
-(but not necessarily installed).  The following files will then need to 
-be placed in the stella/src/macosx diretory:
-
-   libpng.a
-   png.h
-   pngconf.h
-   
-Finally, the application is going to 
    
 Mark Grebe
 
-$Id: READMEbuild.txt,v 1.2 2005-08-25 01:22:20 markgrebe Exp $
+$Id: READMEbuild.txt,v 1.3 2006-11-18 13:34:26 stephena Exp $

stella/src/macosx/stella.pbproj/project.pbxproj

@@ -243,7 +243,7 @@
 				LIBRARY_SEARCH_PATHS = .;
 				OPTIMIZATION_CFLAGS = "-O3";
 				OTHER_CFLAGS = "-DMAC_OSX -DJOYSTICK_SUPPORT -DSOUND_SUPPORT -DDISPLAY_OPENGL -DTEXTURES_ARE_LOST -DDEVELOPER_SUPPORT -DCHEATCODE_SUPPORT -DHAVE_GETTIMEOFDAY -DSNAPSHOT_SUPPORT -DBSPF_MAC_OSX -DHAVE_INTTYPES ";
-				OTHER_LDFLAGS = "-framework SDL -lz -lpng";
+				OTHER_LDFLAGS = "-framework SDL -lz";
 				PRODUCT_NAME = StellaOSX;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";

stella/src/macosx/stella.xcodeproj/project.pbxproj

@@ -1511,7 +1511,6 @@
 					"-framework",
 					SDL,
 					"-lz",
-					"-lpng",
 				);
 				PRODUCT_NAME = StellaOSX;
 				SECTORDER_FLAGS = "";
@@ -1817,21 +1816,18 @@
 					../../../../debugger,
 					./gui,
 					../gui,
-					./libpng,
 					.,
 				);
 				INFOPLIST_FILE = "Info-StellaOSX__Upgraded_.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = (
 					"$(LIBRARY_SEARCH_PATHS)",
-					./libpng/build/release,
 				);
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SDL,
 					"-lz",
-					"-lpng",
 				);
 				PRODUCT_NAME = StellaOSX;
 				SECTORDER_FLAGS = "";
@@ -1881,21 +1877,18 @@
 					../../../../debugger,
 					./gui,
 					../gui,
-					./libpng,
 					.,
 				);
 				INFOPLIST_FILE = "Info-StellaOSX__Upgraded_.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = (
 					"$(LIBRARY_SEARCH_PATHS)",
-					./libpng/build/release,
 				);
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SDL,
 					"-lz",
-					"-lpng",
 				);
 				PRODUCT_NAME = StellaOSX;
 				SECTORDER_FLAGS = "";
@@ -1953,7 +1946,6 @@
 					"-framework",
 					SDL,
 					"-lz",
-					"-lpng",
 				);
 				PRODUCT_NAME = StellaOSX;
 				SECTORDER_FLAGS = "";