mirror of
https://github.com/elasota/Aerofoil.git
synced 2025-12-13 19:49:36 +00:00
Misc tweaks, partially bump version to 1.1
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
set INPUT_DIR=../AerofoilSDL
|
set INPUT_DIR=../AerofoilSDL
|
||||||
set OUTPUT_DIR=obj
|
set OUTPUT_DIR=obj
|
||||||
set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY -O0 -DGP_DEBUG_CONFIG=0
|
set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY -O3 -DGP_DEBUG_CONFIG=0
|
||||||
|
|
||||||
emcc -c %INPUT_DIR%/AerofoilSDL_Combined.cpp -o %OUTPUT_DIR%/AerofoilSDL_Combined.o %FLAGS%
|
emcc -c %INPUT_DIR%/AerofoilSDL_Combined.cpp -o %OUTPUT_DIR%/AerofoilSDL_Combined.o %FLAGS%
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
set INPUT_DIR=../GpApp
|
set INPUT_DIR=../GpApp
|
||||||
set OUTPUT_DIR=obj
|
set OUTPUT_DIR=obj
|
||||||
set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY -O0 -DGP_DEBUG_CONFIG=0
|
set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY -O3 -DGP_DEBUG_CONFIG=0
|
||||||
|
|
||||||
emcc -c %INPUT_DIR%/GpApp_Combined.cpp -o %OUTPUT_DIR%/GpApp_Combined.o %FLAGS%
|
emcc -c %INPUT_DIR%/GpApp_Combined.cpp -o %OUTPUT_DIR%/GpApp_Combined.o %FLAGS%
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
set INPUT_DIR=../GpShell
|
set INPUT_DIR=../GpShell
|
||||||
set OUTPUT_DIR=obj
|
set OUTPUT_DIR=obj
|
||||||
set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY -O0 -DGP_DEBUG_CONFIG=0
|
set FLAGS=-s USE_SDL=2 -flto -I../GpCommon/ -I../PortabilityLayer/ -I../Common/ -s ASYNCIFY -O3 -DGP_DEBUG_CONFIG=0
|
||||||
|
|
||||||
emcc -c %INPUT_DIR%/GpShell_Combined.cpp -o %OUTPUT_DIR%/GpShell_Combined.o %FLAGS%
|
emcc -c %INPUT_DIR%/GpShell_Combined.cpp -o %OUTPUT_DIR%/GpShell_Combined.o %FLAGS%
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
set INPUT_DIR=.
|
set INPUT_DIR=.
|
||||||
set OUTPUT_DIR=bin
|
set OUTPUT_DIR=bin
|
||||||
set FLAGS=-flto -O0 -g -s USE_SDL=2 -s USE_ZLIB=1 -s ASYNCIFY -s ASYNCIFY_IGNORE_INDIRECT -s INITIAL_MEMORY=33554432 -s ASYNCIFY_ADVISE
|
set FLAGS=-flto -O3 -s USE_SDL=2 -s USE_ZLIB=1 -s ASYNCIFY -s ASYNCIFY_IGNORE_INDIRECT -s INITIAL_MEMORY=33554432 -s ASYNCIFY_ADVISE
|
||||||
|
|
||||||
emcc obj/AerofoilWeb_Combined.o obj/AerofoilWeb_Resources.o obj/GpShell_Combined.o obj/AerofoilSDL_Combined.o obj/GpApp_Combined.o obj/PortabilityLayer_Combined.o obj/MacRomanConversion.o -o %OUTPUT_DIR%/aerofoil.html %FLAGS%
|
emcc obj/AerofoilWeb_Combined.o obj/AerofoilWeb_Resources.o obj/GpShell_Combined.o obj/AerofoilSDL_Combined.o obj/GpApp_Combined.o obj/PortabilityLayer_Combined.o obj/MacRomanConversion.o -o %OUTPUT_DIR%/aerofoil.html %FLAGS%
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
#include "FileManager.h"
|
#include "FileManager.h"
|
||||||
#include "GpIOStream.h"
|
#include "GpIOStream.h"
|
||||||
#include "House.h"
|
#include "House.h"
|
||||||
|
#include "IGpLogDriver.h"
|
||||||
#include "IGpSystemServices.h"
|
#include "IGpSystemServices.h"
|
||||||
#include "ObjectEdit.h"
|
#include "ObjectEdit.h"
|
||||||
#include "ResourceManager.h"
|
#include "ResourceManager.h"
|
||||||
@@ -858,6 +859,11 @@ Boolean QuerySaveChanges (void)
|
|||||||
|
|
||||||
void YellowAlert (short whichAlert, short identifier)
|
void YellowAlert (short whichAlert, short identifier)
|
||||||
{
|
{
|
||||||
|
IGpLogDriver *logger = PLDrivers::GetLogDriver();
|
||||||
|
|
||||||
|
if (logger)
|
||||||
|
logger->Printf(IGpLogDriver::Category_Warning, "Yellow alert %i identifier %i", static_cast<int>(whichAlert), static_cast<int>(identifier));
|
||||||
|
|
||||||
#define kYellowAlert 1006
|
#define kYellowAlert 1006
|
||||||
Str255 errStr, errNumStr;
|
Str255 errStr, errNumStr;
|
||||||
short whoCares;
|
short whoCares;
|
||||||
|
|||||||
@@ -599,7 +599,7 @@ int AppStartup()
|
|||||||
FlushResolutionChange();
|
FlushResolutionChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
ShowInitialLaunchDisclaimer();
|
//ShowInitialLaunchDisclaimer();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (thisMac.isResolutionDirty)
|
if (thisMac.isResolutionDirty)
|
||||||
|
|||||||
@@ -10,12 +10,15 @@
|
|||||||
#include "PLSound.h"
|
#include "PLSound.h"
|
||||||
#include "DialogManager.h"
|
#include "DialogManager.h"
|
||||||
#include "Externs.h"
|
#include "Externs.h"
|
||||||
|
#include "IGpLogDriver.h"
|
||||||
#include "MemoryManager.h"
|
#include "MemoryManager.h"
|
||||||
#include "ResourceManager.h"
|
#include "ResourceManager.h"
|
||||||
#include "SoundSync.h"
|
#include "SoundSync.h"
|
||||||
#include "VirtualDirectory.h"
|
#include "VirtualDirectory.h"
|
||||||
#include "WaveFormat.h"
|
#include "WaveFormat.h"
|
||||||
|
|
||||||
|
#include "PLDrivers.h"
|
||||||
|
|
||||||
|
|
||||||
#define kBaseBufferSoundID 1000
|
#define kBaseBufferSoundID 1000
|
||||||
#define kMaxSounds 64
|
#define kMaxSounds 64
|
||||||
@@ -273,26 +276,47 @@ void DumpBufferSounds (void)
|
|||||||
|
|
||||||
PLError_t OpenSoundChannels (void)
|
PLError_t OpenSoundChannels (void)
|
||||||
{
|
{
|
||||||
|
IGpLogDriver *logger = PLDrivers::GetLogDriver();
|
||||||
|
|
||||||
if (channelOpen)
|
if (channelOpen)
|
||||||
|
{
|
||||||
|
if (logger)
|
||||||
|
logger->Printf(IGpLogDriver::Category_Error, "Audio was already opened?");
|
||||||
return PLErrors::kAudioError;
|
return PLErrors::kAudioError;
|
||||||
|
}
|
||||||
|
|
||||||
channel0 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
|
channel0 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
|
||||||
if (channel0)
|
if (channel0)
|
||||||
channelOpen = true;
|
channelOpen = true;
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (logger)
|
||||||
|
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 0 failed to open");
|
||||||
|
|
||||||
return PLErrors::kAudioError;
|
return PLErrors::kAudioError;
|
||||||
|
}
|
||||||
|
|
||||||
channel1 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
|
channel1 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
|
||||||
if (channel1)
|
if (channel1)
|
||||||
channelOpen = true;
|
channelOpen = true;
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (logger)
|
||||||
|
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 1 failed to open");
|
||||||
|
|
||||||
return PLErrors::kAudioError;
|
return PLErrors::kAudioError;
|
||||||
|
}
|
||||||
|
|
||||||
channel2 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
|
channel2 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
|
||||||
if (channel2)
|
if (channel2)
|
||||||
channelOpen = true;
|
channelOpen = true;
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
if (logger)
|
||||||
|
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 2 failed to open");
|
||||||
|
|
||||||
return PLErrors::kAudioError;
|
return PLErrors::kAudioError;
|
||||||
|
}
|
||||||
|
|
||||||
return PLErrors::kNone;
|
return PLErrors::kNone;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define GP_BUILD_VERSION_MAJOR 1
|
#define GP_BUILD_VERSION_MAJOR 1
|
||||||
#define GP_BUILD_VERSION_MINOR 0
|
#define GP_BUILD_VERSION_MINOR 1
|
||||||
#define GP_BUILD_VERSION_UPDATE 17
|
#define GP_BUILD_VERSION_UPDATE 0
|
||||||
|
|
||||||
#define GP_APPLICATION_VERSION_STRING "1.0.17"
|
#define GP_APPLICATION_VERSION_STRING "1.1.0"
|
||||||
#define GP_APPLICATION_COPYRIGHT_STRING "2019-2021 Eric Lasota"
|
#define GP_APPLICATION_COPYRIGHT_STRING "2019-2021 Eric Lasota"
|
||||||
#define GP_APPLICATION_WEBSITE_STRING "https://github.com/elasota/Aerofoil"
|
#define GP_APPLICATION_WEBSITE_STRING "https://github.com/elasota/Aerofoil"
|
||||||
|
|||||||
Reference in New Issue
Block a user