WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 06:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Misc tweaks, partially bump version to 1.1

Browse Source
This commit is contained in:
elasota
2021-03-30 05:24:37 -04:00
parent 69f59f769d
commit 1ac69c2c75
8 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AerofoilWeb/BuildAerofoilSDL.bat
View File

@@ -1,6 +1,6 @@
set INPUT_DIR=../AerofoilSDL
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%

2
AerofoilWeb/BuildGpApp.bat
View File

@@ -1,6 +1,6 @@
set INPUT_DIR=../GpApp
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%

2
AerofoilWeb/BuildGpShell.bat
View File

@@ -1,6 +1,6 @@
set INPUT_DIR=../GpShell
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%

2
AerofoilWeb/Link.bat
View File

@@ -1,5 +1,5 @@
set INPUT_DIR=.
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%

6
GpApp/HouseIO.cpp
View File

@@ -12,6 +12,7 @@
#include "FileManager.h"
#include "GpIOStream.h"
#include "House.h"
#include "IGpLogDriver.h"
#include "IGpSystemServices.h"
#include "ObjectEdit.h"
#include "ResourceManager.h"
@@ -858,6 +859,11 @@ Boolean QuerySaveChanges (void)
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
Str255 errStr, errNumStr;
short whoCares;

2
GpApp/Main.cpp
View File

@@ -599,7 +599,7 @@ int AppStartup()
FlushResolutionChange();
}
ShowInitialLaunchDisclaimer();
//ShowInitialLaunchDisclaimer();
}
if (thisMac.isResolutionDirty)

24
GpApp/Sound.cpp
View File

@@ -10,12 +10,15 @@
#include "PLSound.h"
#include "DialogManager.h"
#include "Externs.h"
#include "IGpLogDriver.h"
#include "MemoryManager.h"
#include "ResourceManager.h"
#include "SoundSync.h"
#include "VirtualDirectory.h"
#include "WaveFormat.h"
#include "PLDrivers.h"
#define kBaseBufferSoundID 1000
#define kMaxSounds 64
@@ -273,26 +276,47 @@ void DumpBufferSounds (void)
PLError_t OpenSoundChannels (void)
{
IGpLogDriver *logger = PLDrivers::GetLogDriver();
if (channelOpen)
{
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Audio was already opened?");
return PLErrors::kAudioError;
}
channel0 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
if (channel0)
channelOpen = true;
else
{
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 0 failed to open");
return PLErrors::kAudioError;
}
channel1 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
if (channel1)
channelOpen = true;
else
{
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 1 failed to open");
return PLErrors::kAudioError;
}
channel2 = PortabilityLayer::SoundSystem::GetInstance()->CreateChannel();
if (channel2)
channelOpen = true;
else
{
if (logger)
logger->Printf(IGpLogDriver::Category_Error, "Audio channel 2 failed to open");
return PLErrors::kAudioError;
}
return PLErrors::kNone;
}

6
GpCommon/GpBuildVersion.h
View File

@@ -1,9 +1,9 @@
#pragma once
#define GP_BUILD_VERSION_MAJOR 1
#define GP_BUILD_VERSION_MINOR 0
#define GP_BUILD_VERSION_UPDATE 17
#define GP_BUILD_VERSION_MINOR 1
#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_WEBSITE_STRING "https://github.com/elasota/Aerofoil"