Moved OS X specific Info.plist into packaging/OSX/Info.plist
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6298 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
beaglejoe
parent
71bb4f5311
commit
f15ce0f637
|
|
@ -1,42 +1,44 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>BuildMachineOSBuild</key>
|
||||
<string>14F27</string>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>../games/speed-dreams-2</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string></string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string></string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
<key>DTCompiler</key>
|
||||
<string>com.apple.compilers.llvm.clang.1_0</string>
|
||||
<key>DTPlatformBuild</key>
|
||||
<string>6E35b</string>
|
||||
<key>DTPlatformVersion</key>
|
||||
<string>GM</string>
|
||||
<key>DTSDKBuild</key>
|
||||
<string>14D125</string>
|
||||
<key>DTSDKName</key>
|
||||
<string>macosx10.10</string>
|
||||
<key>DTXcode</key>
|
||||
<string>0640</string>
|
||||
<key>DTXcodeBuild</key>
|
||||
<string>6E35b</string>
|
||||
<key>LSRequiresCarbon</key>
|
||||
<true/>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
</dict>
|
||||
</plist>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>BuildMachineOSBuild</key>
|
||||
<string>14F27</string>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>../games/speed-dreams-2</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string></string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string></string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
<true/>
|
||||
<key>DTCompiler</key>
|
||||
<string>com.apple.compilers.llvm.clang.1_0</string>
|
||||
<key>DTPlatformBuild</key>
|
||||
<string>6E35b</string>
|
||||
<key>DTPlatformVersion</key>
|
||||
<string>GM</string>
|
||||
<key>DTSDKBuild</key>
|
||||
<string>14D125</string>
|
||||
<key>DTSDKName</key>
|
||||
<string>macosx10.10</string>
|
||||
<key>DTXcode</key>
|
||||
<string>0640</string>
|
||||
<key>DTXcodeBuild</key>
|
||||
<string>6E35b</string>
|
||||
<key>LSRequiresCarbon</key>
|
||||
<true/>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>sd-icon-mac-256.icns</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
</dict>
|
||||
</plist>
|
||||
Binary file not shown.
|
|
@ -439,7 +439,8 @@ SDL_Surface* gfScrCreateWindow(int nWinWidth, int nWinHeight, int nTotalDepth,in
|
|||
nWinWidth, nWinHeight, SDL_WINDOW_HIDDEN | SDL_WINDOW_OPENGL);
|
||||
|
||||
|
||||
// Set window icon (MUST be a 32x32 icon for Windows, and with black pixels as alpha ones,
|
||||
#if !defined(__APPLE__)
|
||||
// Set window icon (MUST be a 32x32 icon for Windows, and with black pixels as alpha ones,
|
||||
// as BMP doesn't support transparency).
|
||||
std::ostringstream ossIconFilename;
|
||||
ossIconFilename << GfDataDir() << "data/icons/icon.bmp";
|
||||
|
|
@ -450,7 +451,7 @@ SDL_Surface* gfScrCreateWindow(int nWinWidth, int nWinHeight, int nTotalDepth,in
|
|||
SDL_SetWindowIcon(GfuiWindow, surfIcon);
|
||||
SDL_FreeSurface(surfIcon);
|
||||
}
|
||||
|
||||
#endif
|
||||
// attempt to make window operational
|
||||
SDL_Renderer *renderer = SDL_CreateRenderer(GfuiWindow, -1, 0);
|
||||
SDL_RenderPresent(renderer);
|
||||
|
|
@ -572,6 +573,11 @@ bool GfScrInitSDL2(int nWinWidth, int nWinHeight, int nFullScreen)
|
|||
if(bFullScreen)
|
||||
bfVideoMode |= SDL_WINDOW_FULLSCREEN;
|
||||
|
||||
// TODO ?
|
||||
// Add new values to the config OpenGL Major and Minor
|
||||
// and setup GL Major/Minor before window creation
|
||||
// SDL_GL_SetSwapInterval(1) for for vsync (may have to go AFTER window creation)
|
||||
|
||||
if (bTryBestVInitMode)
|
||||
{
|
||||
GfLogInfo("Trying 'best possible mode' for video initialization.\n");
|
||||
|
|
|
|||
|
|
@ -51,7 +51,8 @@ SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME})
|
|||
IF((APPLE) AND ("${CMAKE_INSTALL_PREFIX}" MATCHES "\\.app$"))
|
||||
SET(OSG_PLUGIN_DIR /opt/local/lib/osgPlugins-3.4.0)
|
||||
message("OSG_PLUGIN_DIR = ${OSG_PLUGIN_DIR}")
|
||||
INSTALL(FILES Info.plist DESTINATION ./Contents)
|
||||
INSTALL(FILES ../../packaging/OSX/Info.plist DESTINATION ./Contents)
|
||||
INSTALL(FILES ../../packaging/OSX/sd-icon-mac-256.icns DESTINATION ./Contents/Resources)
|
||||
SET(APPS "\${CMAKE_INSTALL_PREFIX}/games/${_TARGET_NAME}")
|
||||
SET(DIRS)
|
||||
#SET(DIRS ${DIRS} "${OSG_PLUGIN_DIR}")
|
||||
|
|
|
|||
Loading…
Reference in New Issue