minor tweaks (could not find app icon, and CMakeInstall directives)
This commit is contained in:
		
							parent
							
								
									57d283ad48
								
							
						
					
					
						commit
						b0d6d5baa6
					
				@ -93,3 +93,7 @@ INSTALL (DIRECTORY ${DATA_DIR}
 | 
				
			|||||||
INSTALL (FILES ${DATA_FILES}
 | 
					INSTALL (FILES ${DATA_FILES}
 | 
				
			||||||
	DESTINATION share/fysxasteroids
 | 
						DESTINATION share/fysxasteroids
 | 
				
			||||||
	)
 | 
						)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INSTALL (FILES fysxasteroids.desktop fysxasteroidseditor.desktop
 | 
				
			||||||
 | 
						DESTINATION /usr/share/applications
 | 
				
			||||||
 | 
						)
 | 
				
			||||||
 | 
				
			|||||||
@ -144,9 +144,9 @@ int main (int argc, char* argv[]) {
 | 
				
			|||||||
	// Load the icon
 | 
						// Load the icon
 | 
				
			||||||
	Uint32          colorkey;
 | 
						Uint32          colorkey;
 | 
				
			||||||
	SDL_Surface     *image = NULL;
 | 
						SDL_Surface     *image = NULL;
 | 
				
			||||||
	image = SDL_LoadBMP("./data/textures/icon.bmp");
 | 
						image = SDL_LoadBMP(Engine::GetResourceFullPath("/data/textures/icon.bmp").c_str());
 | 
				
			||||||
	if (!image)
 | 
						if (!image)
 | 
				
			||||||
		Engine::LogWarning("Could not load icon: ./data/textures/icon.bmp");
 | 
							Engine::LogWarning("Could not load icon: data/textures/icon.bmp");
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		SDL_WM_SetIcon(image,NULL);
 | 
							SDL_WM_SetIcon(image,NULL);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -272,6 +272,7 @@ bool Cmd_Exec (const std::vector<std::string> args) {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	exec_file.close();
 | 
						exec_file.close();
 | 
				
			||||||
 | 
						LogDebug ("exec success for file %s", full_path.c_str());
 | 
				
			||||||
	return true;
 | 
						return true;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user