Browse Source

OSX related change

LouYihua 7 years ago
parent
commit
67b01eb953

English.lproj/InfoPlist.strings → osx/English.lproj/InfoPlist.strings


Info.plist → osx/Info.plist


+ 6 - 4
Pal.xcodeproj/project.pbxproj

@@ -146,7 +146,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		002F3A3E09D088BA00EBEB88 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = SOURCE_ROOT; };
+		002F3A3E09D088BA00EBEB88 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 3; lastKnownFileType = sourcecode.c.c; path = ../main.c; sourceTree = SOURCE_ROOT; };
 		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
@@ -494,7 +494,7 @@
 				5757D21F1B7A3D5800464A74 /* include */,
 				5757D2281B7A3D5800464A74 /* src */,
 			);
-			path = liboggvorbis;
+			path = ../liboggvorbis;
 			sourceTree = "<group>";
 		};
 		5757D21F1B7A3D5800464A74 /* include */ = {
@@ -669,6 +669,7 @@
 				7104FDA80D772FBC00A97E53 /* rix.h */,
 			);
 			name = adplug;
+			path = ../adplug;
 			sourceTree = "<group>";
 		};
 		71E23E7013F6D188001287B6 /* libmad */ = {
@@ -706,6 +707,7 @@
 				71E23E8E13F6D1AD001287B6 /* timer.h */,
 			);
 			name = libmad;
+			path = ../libmad;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -889,8 +891,8 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				HEADER_SEARCH_PATHS = (
 					/Library/Frameworks/SDL2.framework/Headers,
-					./liboggvorbis/include,
-					./liboggvorbis/src,
+					../liboggvorbis/include,
+					../liboggvorbis/src,
 					"$(HEADER_SEARCH_PATHS)",
 				);
 				INFOPLIST_FILE = Info.plist;

Pal.xcodeproj/project.xcworkspace/contents.xcworkspacedata → osx/Pal.xcodeproj/project.xcworkspace/contents.xcworkspacedata


+ 34 - 0
osx/pal_config.h

@@ -0,0 +1,34 @@
+#ifndef PAL_CONFIG_H
+# define PAL_CONFIG_H
+
+# ifndef PAL_HAS_JOYSTICKS
+#  define PAL_HAS_JOYSTICKS    1
+# endif
+
+# if SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION <= 2
+#  define PAL_ALLOW_KEYREPEAT   1
+#  define PAL_HAS_SDLCD         1
+# endif
+
+# define PAL_PREFIX            "./"
+# define PAL_SAVE_PREFIX       "./"
+
+# define PAL_DEFAULT_WINDOW_WIDTH   640
+# define PAL_DEFAULT_WINDOW_HEIGHT  400
+# define PAL_DEFAULT_FULLSCREEN_HEIGHT 480
+
+# if SDL_VERSION_ATLEAST(2,0,0)
+#  define PAL_VIDEO_INIT_FLAGS  (SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE | (gConfig.fFullScreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0))
+# else
+#  define PAL_VIDEO_INIT_FLAGS  (SDL_HWSURFACE | SDL_RESIZABLE | (gConfig.fFullScreen ? SDL_FULLSCREEN : 0))
+# endif
+
+# define PAL_SDL_INIT_FLAGS	(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_CDROM | SDL_INIT_NOPARACHUTE | SDL_INIT_JOYSTICK)
+
+# define PAL_PLATFORM         NULL
+# define PAL_CREDIT           NULL
+# define PAL_PORTYEAR         NULL
+
+# define PAL_HAS_CONFIG_PAGE  1
+
+#endif

sdlpal.icns → osx/sdlpal.icns