publish changes
This commit is contained in:
Archie
parent
afc5064a7b
commit
ac2c6ac843
1605 changed files with 3354 additions and 3354 deletions
|
|
@ -18,7 +18,7 @@
|
|||
#include <cassert>
|
||||
|
||||
#if ASIO_SYSTEM_WINDOWS
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#if !defined(NTDDI_VERSION)
|
||||
#error "NTDDI_VERSION undefined"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include <cassert>
|
||||
|
||||
#if ASIO_SYSTEM_WINDOWS
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#if !defined(NTDDI_VERSION)
|
||||
#error "NTDDI_VERSION undefined"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -932,14 +932,14 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE
|
|||
* Specifying \c partial_tukey or \c punchout_tukey works a little
|
||||
* different. These do not specify a single apodization function, but
|
||||
* a series of them with some overlap. partial_tukey specifies a series
|
||||
* of small windows (all treated separately) while punchout_tukey
|
||||
* specifies a series of windows that have a hole in them. In this way,
|
||||
* of small arch (all treated separately) while punchout_tukey
|
||||
* specifies a series of arch that have a hole in them. In this way,
|
||||
* the predictor is constructed with only a part of the block, which
|
||||
* helps in case a block consists of dissimilar parts.
|
||||
*
|
||||
* The three parameters that can be specified for the functions are
|
||||
* n, ov and P. n is the number of functions to add, ov is the overlap
|
||||
* of the windows in case of partial_tukey and the overlap in the gaps
|
||||
* of the arch in case of partial_tukey and the overlap in the gaps
|
||||
* in case of punchout_tukey. P is the fraction of the window that is
|
||||
* tapered, like with a regular tukey window. The function can be
|
||||
* specified with only a number, a number and an overlap, or a number
|
||||
|
|
@ -955,7 +955,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE
|
|||
* partial_tukey(3) and punchout_tukey(3), specifying subdivide_tukey(5)
|
||||
* equivalently adds partial_tukey(4), punchout_tukey(4), partial_tukey(5)
|
||||
* and punchout_tukey(5). To be able to reuse data as much as possible,
|
||||
* the tukey taper is taken equal for all windows, and the P specified is
|
||||
* the tukey taper is taken equal for all arch, and the P specified is
|
||||
* applied for the smallest used window. In other words,
|
||||
* subdivide_tukey(2/0.5) results in a taper equal to that of tukey(0.25)
|
||||
* and subdivide_tukey(5) in a taper equal to that of tukey(0.1). The
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ int utime_utf8(const char *filename, struct utimbuf *times);
|
|||
int unlink_utf8(const char *filename);
|
||||
int rename_utf8(const char *oldname, const char *newname);
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@
|
|||
|
||||
#ifdef _WIN32
|
||||
|
||||
#ifndef flac__windows_unicode_filenames_h
|
||||
#define flac__windows_unicode_filenames_h
|
||||
#ifndef flac__arch_unicode_filenames_h
|
||||
#define flac__arch_unicode_filenames_h
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
|||
|
|
@ -3417,7 +3417,7 @@ FLAC__bool transport_tempfile_(const char *filename, FILE **tempfile, char **tem
|
|||
*tempfile = 0;
|
||||
|
||||
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ || defined __EMX__
|
||||
/* on some flavors of windows, flac_rename() will fail if the destination already exists */
|
||||
/* on some flavors of arch, flac_rename() will fail if the destination already exists */
|
||||
if(flac_unlink(filename) < 0) {
|
||||
cleanup_tempfile_(tempfile, tempfilename);
|
||||
*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
#include <string.h> /* for memcpy() */
|
||||
#include <sys/types.h> /* for off_t */
|
||||
#ifdef _WIN32
|
||||
#include <windows.h> /* for GetFileType() */
|
||||
#include <arch.h> /* for GetFileType() */
|
||||
#include <io.h> /* for _get_osfhandle() */
|
||||
#endif
|
||||
#include "share/compat.h"
|
||||
|
|
@ -2633,7 +2633,7 @@ FLAC__bool resize_buffers_(FLAC__StreamEncoder *encoder, uint32_t new_blocksize)
|
|||
if(encoder->protected_->do_escape_coding)
|
||||
ok = ok && FLAC__memory_alloc_aligned_unsigned_array(new_blocksize * 2, &encoder->private_->raw_bits_per_partition_unaligned, &encoder->private_->raw_bits_per_partition);
|
||||
|
||||
/* now adjust the windows if the blocksize has changed */
|
||||
/* now adjust the arch if the blocksize has changed */
|
||||
#ifndef FLAC__INTEGER_ONLY_LIBRARY
|
||||
if(ok && new_blocksize != encoder->private_->input_capacity && encoder->protected_->max_lpc_order > 0) {
|
||||
for(i = 0; ok && i < encoder->protected_->num_apodizations; i++) {
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@
|
|||
#endif
|
||||
|
||||
#include <io.h>
|
||||
#include <windows.h>
|
||||
#include "share/windows_unicode_filenames.h"
|
||||
#include <arch.h>
|
||||
#include "share/arch_unicode_filenames.h"
|
||||
|
||||
/*** FIXME: KLUDGE: export these syms for flac.exe, metaflac.exe, etc. ***/
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#endif
|
||||
|
||||
#include <io.h>
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include "share/win_utf8_io.h"
|
||||
|
||||
#define UTF8_BUFFER_SIZE 32768
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ OSX:
|
|||
https://github.com/bkaradzic/bx/raw/master/tools/bin/darwin/genie
|
||||
|
||||
Windows:
|
||||
https://github.com/bkaradzic/bx/raw/master/tools/bin/windows/genie.exe
|
||||
https://github.com/bkaradzic/bx/raw/master/tools/bin/arch/genie.exe
|
||||
|
||||
Building (dev)
|
||||
--------------
|
||||
|
|
@ -95,7 +95,7 @@ of Premake 4.4 beta 5, and there is no intention to keep it compatible with it.
|
|||
- Fixed PCH race when using concurrent Makefile build.
|
||||
- Added Green Hills Software compiler support.
|
||||
- Added edit & continue support for 64-bit builds in vs2013 upwards.
|
||||
- Added `windowstargetplatformversion` to specify VS Windows target version.
|
||||
- Added `archtargetplatformversion` to specify VS Windows target version.
|
||||
- Added `NoWinRT` flag to disable WinRT CX builds.
|
||||
- Added `NoBufferSecurityCheck` flag to disable security checks in VS.
|
||||
- Added `nopch` file list to exclude files from using PCH.
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ MAKEFILE = genie.make
|
|||
|
||||
ifeq ($(config),release)
|
||||
OBJDIR = obj/Release
|
||||
TARGETDIR = ../../bin/windows
|
||||
TARGETDIR = ../../bin/arch
|
||||
override TARGET = $(TARGETDIR)/genie.exe
|
||||
DEFINES += -DNDEBUG -DLUA_COMPAT_MODULE
|
||||
INCLUDES += -I"../../src/host/lua-5.3.0/src"
|
||||
|
|
@ -134,7 +134,7 @@ endif
|
|||
|
||||
ifeq ($(config),debug)
|
||||
OBJDIR = obj/Debug
|
||||
TARGETDIR = ../../bin/windows
|
||||
TARGETDIR = ../../bin/arch
|
||||
override TARGET = $(TARGETDIR)/genie.exe
|
||||
DEFINES += -D_DEBUG -DLUA_COMPAT_MODULE
|
||||
INCLUDES += -I"../../src/host/lua-5.3.0/src"
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@
|
|||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>..\..\bin\windows\</OutDir>
|
||||
<OutDir>..\..\bin\arch\</OutDir>
|
||||
<IntDir>obj\Release\</IntDir>
|
||||
<TargetName>genie</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>..\..\bin\windows\</OutDir>
|
||||
<OutDir>..\..\bin\arch\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>genie</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@
|
|||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<OutDir>..\..\bin\windows\</OutDir>
|
||||
<OutDir>..\..\bin\arch\</OutDir>
|
||||
<IntDir>obj\Release\</IntDir>
|
||||
<TargetName>genie</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>..\..\bin\windows\</OutDir>
|
||||
<OutDir>..\..\bin\arch\</OutDir>
|
||||
<IntDir>obj\Debug\</IntDir>
|
||||
<TargetName>genie</TargetName>
|
||||
<TargetExt>.exe</TargetExt>
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ Possible values:
|
|||
|
||||
* Configuration names - configuration names passed to [configurations](#configurations)
|
||||
* Action names - "vs2015", "gmake", etc.
|
||||
* Operating system names - "windows", "macosx", etc.
|
||||
* Operating system names - "arch", "macosx", etc.
|
||||
* Platform names - "ps3", "xbox360", etc.
|
||||
* Command-line options - either built-in or custom
|
||||
* File names - very limited, but some settings can be applied to specific files
|
||||
|
|
@ -337,7 +337,7 @@ configuration "linux or macosx"
|
|||
Define a symbol based on a "not"
|
||||
|
||||
```lua
|
||||
configuration "not windows"
|
||||
configuration "not arch"
|
||||
defines { "NOT_WINDOWS" }
|
||||
```
|
||||
|
||||
|
|
@ -1029,7 +1029,7 @@ When linking against system libraries, do not include any prefix or file extensi
|
|||
Link against some system libraries
|
||||
|
||||
```lua
|
||||
configuration "windows"
|
||||
configuration "arch"
|
||||
links { "user32", "gdi32" }
|
||||
|
||||
configuration "linux"
|
||||
|
|
@ -1365,10 +1365,10 @@ _commands_ - one or more shell commands
|
|||
#### Examples
|
||||
|
||||
```lua
|
||||
configuration "windows"
|
||||
configuration "arch"
|
||||
postbuildcommands { "copy default.config bin\\project.config" }
|
||||
|
||||
configuration "not windows"
|
||||
configuration "not arch"
|
||||
postbuildcommands { "cp default.config bin/project.config" }
|
||||
```
|
||||
|
||||
|
|
@ -1404,10 +1404,10 @@ _commands_ - one or more shell commands
|
|||
#### Examples
|
||||
|
||||
```lua
|
||||
configuration "windows"
|
||||
configuration "arch"
|
||||
prebuildcommands { "copy default.config bin\\project.config" }
|
||||
|
||||
configuration "not windows"
|
||||
configuration "not arch"
|
||||
prebuildcommands { "cp default.config bin/project.config" }
|
||||
```
|
||||
|
||||
|
|
@ -1425,10 +1425,10 @@ _commands_ - one or more shell commands
|
|||
#### Examples
|
||||
|
||||
```lua
|
||||
configuration "windows"
|
||||
configuration "arch"
|
||||
prelinkcommands { "copy default.config bin\\project.config" }
|
||||
|
||||
configuration "not windows"
|
||||
configuration "not arch"
|
||||
prelinkcommands { "cp default.config bin/project.config" }
|
||||
```
|
||||
|
||||
|
|
@ -2072,7 +2072,7 @@ _falseval_ - value to return if _condition_ evaluates to `false`
|
|||
#### Examples
|
||||
|
||||
```lua
|
||||
result = iif(os.is("windows"), "is windows", "is not windows")
|
||||
result = iif(os.is("arch"), "is arch", "is not arch")
|
||||
```
|
||||
|
||||
Note that all expressions are evaluated before the condition is checked. The following expression cannot be implemented with an `iif` because it may try to concatenate a string value.
|
||||
|
|
@ -2125,15 +2125,15 @@ The path containing the library file, if found. Otherwise, `nil`.
|
|||
Identifies the currently-targeted operating system.
|
||||
|
||||
#### Return Value
|
||||
One of "bsd", "linux", "macosx", "solaris", or "windows"
|
||||
One of "bsd", "linux", "macosx", "solaris", or "arch"
|
||||
|
||||
**Note:** This function returns the OS being targeted, which is not necessarily the same as the OS on which GENie is being run.
|
||||
|
||||
#### Example
|
||||
|
||||
```lua
|
||||
if os.get() == "windows" then
|
||||
-- do something windows-specific
|
||||
if os.get() == "arch" then
|
||||
-- do something arch-specific
|
||||
end
|
||||
```
|
||||
|
||||
|
|
@ -2184,7 +2184,7 @@ print(string.format(" %d.%d.%d (%s)",
|
|||
Checks the current operating system identifier against a particular value
|
||||
|
||||
#### Arguments
|
||||
_id_ - one of "bsd", "linux", "macosx", "solaris", or "windows"
|
||||
_id_ - one of "bsd", "linux", "macosx", "solaris", or "arch"
|
||||
|
||||
**Note:** This function returns the OS being targeted, which is not necessarily the same as the OS on which GENie is being run.
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ endif
|
|||
endif
|
||||
endif
|
||||
else
|
||||
OS=windows
|
||||
OS=arch
|
||||
endif
|
||||
|
||||
.PHONY: release
|
||||
|
|
@ -39,7 +39,7 @@ clean:
|
|||
$(SILENT) -rm -rf bin
|
||||
|
||||
projgen:
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).windows --os=windows $(PROJECT_TYPE)
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).arch --os=arch $(PROJECT_TYPE)
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).linux --os=linux $(PROJECT_TYPE)
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).darwin --os=macosx --platform=universal32 $(PROJECT_TYPE)
|
||||
$(SILENT) $(GENIE) --to=../build/$(PROJECT_TYPE).freebsd --os=bsd $(PROJECT_TYPE)
|
||||
|
|
@ -47,7 +47,7 @@ projgen:
|
|||
rebuild:
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).$(OS) clean all
|
||||
|
||||
release-windows release-darwin: $(GENIE)
|
||||
release-arch release-darwin: $(GENIE)
|
||||
$(GENIE) release
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).$(OS) clean all
|
||||
$(SILENT) git checkout src/host/version.h
|
||||
|
|
@ -56,12 +56,12 @@ release-linux: $(GENIE)
|
|||
$(SILENT) $(GENIE) release
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).darwin clean all CC=x86_64-apple-darwin20.2-clang
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).linux clean all
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).windows clean all CC=x86_64-w64-mingw32-gcc
|
||||
$(SILENT) $(MAKE) -C build/$(PROJECT_TYPE).arch clean all CC=x86_64-w64-mingw32-gcc
|
||||
$(SILENT) git checkout src/host/version.h
|
||||
|
||||
release: release-$(OS)
|
||||
|
||||
dist: release
|
||||
cp bin/linux/genie ../bx/tools/bin/linux/
|
||||
cp bin/windows/genie.exe ../bx/tools/bin/windows/
|
||||
cp bin/arch/genie.exe ../bx/tools/bin/arch/
|
||||
cp bin/darwin/genie ../bx/tools/bin/darwin/
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@
|
|||
configuration "vs*"
|
||||
defines { "_CRT_SECURE_NO_WARNINGS" }
|
||||
|
||||
configuration "windows"
|
||||
targetdir "../bin/windows"
|
||||
configuration "arch"
|
||||
targetdir "../bin/arch"
|
||||
links { "ole32" }
|
||||
|
||||
configuration "linux"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ function dorelease()
|
|||
|
||||
print("Generating project files...")
|
||||
|
||||
exec(_PREMAKE_COMMAND .. " /to=../build/gmake.windows /os=windows gmake")
|
||||
exec(_PREMAKE_COMMAND .. " /to=../build/gmake.arch /os=arch gmake")
|
||||
exec(_PREMAKE_COMMAND .. " /to=../build/gmake.linux /os=linux gmake")
|
||||
exec(_PREMAKE_COMMAND .. " /to=../build/gmake.darwin /os=macosx /platform=universal32 gmake")
|
||||
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ end
|
|||
function cmake.header(prj)
|
||||
_p('# %s project autogenerated by GENie', premake.action.current().shortname)
|
||||
_p('cmake_minimum_required(VERSION 3.15)')
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
-- Add support for CMP0091, see https://cmake.org/cmake/help/latest/policy/CMP0091.html
|
||||
_p('cmake_policy(SET CMP0091 NEW)')
|
||||
end
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ function premake.cmake.workspace(sln)
|
|||
|
||||
#########################################################################
|
||||
]])
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
-- Add support for CMP0091, see https://cmake.org/cmake/help/latest/policy/CMP0091.html
|
||||
f:write('cmake_policy(SET CMP0091 NEW)\n')
|
||||
end
|
||||
|
|
@ -44,7 +44,7 @@ function premake.cmake.workspace(sln)
|
|||
# CMakeLists autogenerated by GENie
|
||||
cmake_minimum_required(VERSION 3.15)
|
||||
]])
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
-- Add support for CMP0091, see https://cmake.org/cmake/help/latest/policy/CMP0091.html
|
||||
_p('cmake_policy(SET CMP0091 NEW)')
|
||||
end
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
-- Some actions imply a particular operating system: Visual Studio only
|
||||
-- runs on Windows, and Xcode only on Mac OS X. If this is the case,
|
||||
-- uncomment this line and set it to one of "windows", "linux" or "macosx".
|
||||
-- uncomment this line and set it to one of "arch", "linux" or "macosx".
|
||||
-- Otherwise, this action will target the current operating system.
|
||||
-- os = "macosx",
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ local cpp = premake.ninja.cpp
|
|||
local p = premake
|
||||
|
||||
local function wrap_ninja_cmd(c)
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
return 'cmd /c "' .. c .. '"'
|
||||
else
|
||||
return c
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ function qbs.generate_project(prj)
|
|||
_p(indent, 'cpp.cxxLanguageVersion: "c++98"')
|
||||
end
|
||||
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
if not cfg.flags.WinMain and (cfg.kind == 'ConsoleApp' or cfg.kind == 'WindowedApp') then
|
||||
if cfg.flags.Unicode then
|
||||
_p(indent, 'cpp.entryPoint: "wmainCRTStartup"')
|
||||
|
|
@ -188,9 +188,9 @@ function qbs.generate_project(prj)
|
|||
end
|
||||
|
||||
if cfg.flags.Unicode then
|
||||
_p(indent, 'cpp.windowsApiCharacterSet: "unicode"')
|
||||
_p(indent, 'cpp.archApiCharacterSet: "unicode"')
|
||||
else
|
||||
_p(indent, 'cpp.windowsApiCharacterSet: ""')
|
||||
_p(indent, 'cpp.archApiCharacterSet: ""')
|
||||
end
|
||||
|
||||
if not cfg.pchheader or cfg.flags.NoPCH then
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ function qbs.generate_user(sln)
|
|||
|
||||
local qtcreatordir = ""
|
||||
|
||||
if _OS == "windows" then
|
||||
if _OS == "arch" then
|
||||
qtcreatordir = path.join(os.getenv("APPDATA"), "QtProject/qtcreator")
|
||||
else
|
||||
qtcreatordir = path.join(os.getenv("HOME"), ".config/QtProject/qtcreator")
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
trigger = "vs2010",
|
||||
shortname = "Visual Studio 2010",
|
||||
description = "Generate Microsoft Visual Studio 2010 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
trigger = "vs2012",
|
||||
shortname = "Visual Studio 2012",
|
||||
description = "Generate Microsoft Visual Studio 2012 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
trigger = "vs2013",
|
||||
shortname = "Visual Studio 2013",
|
||||
description = "Generate Microsoft Visual Studio 2013 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
trigger = "vs2015",
|
||||
shortname = "Visual Studio 2015",
|
||||
description = "Generate Microsoft Visual Studio 2015 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
solutionVersion = "12",
|
||||
targetFramework = "4.5",
|
||||
toolsVersion = "14.0",
|
||||
windowsTargetPlatformVersion = "8.1",
|
||||
archTargetPlatformVersion = "8.1",
|
||||
supports64bitEditContinue = true,
|
||||
intDirAbsolute = false,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
trigger = "vs2017",
|
||||
shortname = "Visual Studio 2017",
|
||||
description = "Generate Microsoft Visual Studio 2017 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
solutionVersion = "12",
|
||||
targetFramework = "4.5.2",
|
||||
toolsVersion = "15.0",
|
||||
windowsTargetPlatformVersion = "8.1",
|
||||
archTargetPlatformVersion = "8.1",
|
||||
supports64bitEditContinue = true,
|
||||
intDirAbsolute = false,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
trigger = "vs2019",
|
||||
shortname = "Visual Studio 2019",
|
||||
description = "Generate Microsoft Visual Studio 2019 project files",
|
||||
os = "windows",
|
||||
os = "arch",
|
||||
|
||||
valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
|
||||
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
solutionVersion = "12",
|
||||
targetFramework = "4.7.2",
|
||||
toolsVersion = "16.0",
|
||||
windowsTargetPlatformVersion = "10.0",
|
||||
archTargetPlatformVersion = "10.0",
|
||||
supports64bitEditContinue = true,
|
||||
intDirAbsolute = false,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@
|
|||
_p(2, '<ProjectGuid>{%s}</ProjectGuid>',prj.uuid)
|
||||
_p(2, '<RootNamespace>%s</RootNamespace>',prj.name)
|
||||
if vstudio.storeapp ~= "durango" then
|
||||
local windowsTargetPlatformVersion = prj.windowstargetplatformversion or action.vstudio.windowsTargetPlatformVersion
|
||||
if windowsTargetPlatformVersion ~= nil then
|
||||
_p(2,'<WindowsTargetPlatformVersion>%s</WindowsTargetPlatformVersion>',windowsTargetPlatformVersion)
|
||||
local archTargetPlatformVersion = prj.archtargetplatformversion or action.vstudio.archTargetPlatformVersion
|
||||
if archTargetPlatformVersion ~= nil then
|
||||
_p(2,'<WindowsTargetPlatformVersion>%s</WindowsTargetPlatformVersion>',archTargetPlatformVersion)
|
||||
|
||||
if windowsTargetPlatformVersion and string.startswith(windowsTargetPlatformVersion, "10.") then
|
||||
_p(2,'<WindowsTargetPlatformMinVersion>%s</WindowsTargetPlatformMinVersion>', prj.windowstargetplatformminversion or "10.0.10240.0")
|
||||
if archTargetPlatformVersion and string.startswith(archTargetPlatformVersion, "10.") then
|
||||
_p(2,'<WindowsTargetPlatformMinVersion>%s</WindowsTargetPlatformMinVersion>', prj.archtargetplatformminversion or "10.0.10240.0")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -789,7 +789,7 @@
|
|||
|
||||
local function getcfglinks(cfg)
|
||||
local haswholearchive = #cfg.wholearchive > 0
|
||||
local msvcnaming = premake.getnamestyle(cfg) == "windows"
|
||||
local msvcnaming = premake.getnamestyle(cfg) == "arch"
|
||||
local iscppprj = premake.iscppproject(cfg)
|
||||
local isnetprj = premake.isdotnetproject(cfg)
|
||||
local linkobjs = {}
|
||||
|
|
@ -1734,9 +1734,9 @@
|
|||
_p('<?xml version="1.0" encoding="utf-8"?>')
|
||||
if vstudio.storeapp == "10.0" then
|
||||
_p('<Package')
|
||||
_p(1, 'xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"')
|
||||
_p(1, 'xmlns="http://schemas.microsoft.com/appx/manifest/foundation/arch10"')
|
||||
_p(1, 'xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"')
|
||||
_p(1, 'xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"')
|
||||
_p(1, 'xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/arch10"')
|
||||
_p(1, 'IgnorableNamespaces="uap mp">')
|
||||
elseif vstudio.storeapp == "durango" then
|
||||
_p('<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:mx="http://schemas.microsoft.com/appx/2013/xbox/manifest" IgnorableNamespaces="mx">')
|
||||
|
|
|
|||
|
|
@ -940,13 +940,13 @@ end
|
|||
}
|
||||
|
||||
newapifield {
|
||||
name = "windowstargetplatformversion",
|
||||
name = "archtargetplatformversion",
|
||||
kind = "string",
|
||||
scope = "project",
|
||||
}
|
||||
|
||||
newapifield {
|
||||
name = "windowstargetplatformminversion",
|
||||
name = "archtargetplatformminversion",
|
||||
kind = "string",
|
||||
scope = "project",
|
||||
}
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@
|
|||
-- build the targets
|
||||
cfg.buildtarget = premake.gettarget(cfg, "build", pathstyle, namestyle, cfg.system)
|
||||
cfg.linktarget = premake.gettarget(cfg, "link", pathstyle, namestyle, cfg.system)
|
||||
if pathstyle == "windows" then
|
||||
if pathstyle == "arch" then
|
||||
cfg.objectsdir = path.translate(cfg.objectsdir, "\\")
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
{ "linux", "Linux" },
|
||||
{ "macosx", "Apple Mac OS X" },
|
||||
{ "solaris", "Solaris" },
|
||||
{ "windows", "Microsoft Windows" },
|
||||
{ "arch", "Microsoft Windows" },
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
{
|
||||
cfgsuffix = "xbox360",
|
||||
iscrosscompiler = true,
|
||||
namestyle = "windows",
|
||||
namestyle = "arch",
|
||||
},
|
||||
PowerPC =
|
||||
{
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
cfgsuffix = "durango",
|
||||
iscrosscompiler = true,
|
||||
nosharedlibs = true,
|
||||
namestyle = "windows",
|
||||
namestyle = "arch",
|
||||
},
|
||||
TegraAndroid =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
local path, formats
|
||||
|
||||
-- assemble a search path, depending on the platform
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
formats = { "%s.dll", "%s" }
|
||||
path = os.getenv("PATH")
|
||||
else
|
||||
|
|
@ -135,7 +135,7 @@
|
|||
|
||||
-- Identify the system
|
||||
local arch = ""
|
||||
if _OS == "windows" then
|
||||
if _OS == "arch" then
|
||||
arch = os.getenv("PROCESSOR_ARCHITECTURE")
|
||||
elseif _OS == "macosx" then
|
||||
arch = os.outputof("echo $HOSTTYPE")
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@
|
|||
return result
|
||||
else
|
||||
if (not sep) then
|
||||
if (os.is("windows")) then
|
||||
if (os.is("arch")) then
|
||||
sep = "\\"
|
||||
else
|
||||
sep = "/"
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@
|
|||
item = path.getdirectory(link)
|
||||
elseif (part == "fullpath") then
|
||||
item = link
|
||||
if namestyle == "windows" then
|
||||
if namestyle == "arch" then
|
||||
if premake.iscppproject(cfg) then
|
||||
item = item .. ".lib"
|
||||
elseif premake.isdotnetproject(cfg) then
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
end
|
||||
|
||||
if item then
|
||||
if pathstyle == "windows" and part ~= "object" then
|
||||
if pathstyle == "arch" and part ~= "object" then
|
||||
item = path.translate(item, "\\")
|
||||
end
|
||||
if not table.contains(result, item) then
|
||||
|
|
@ -401,7 +401,7 @@
|
|||
-- @param cfg
|
||||
-- The configuration to check.
|
||||
-- @returns
|
||||
-- The target naming style, one of "windows", "posix", or "PS3".
|
||||
-- The target naming style, one of "arch", "posix", or "PS3".
|
||||
--
|
||||
|
||||
function premake.getnamestyle(cfg)
|
||||
|
|
@ -417,12 +417,12 @@
|
|||
-- @param cfg
|
||||
-- The configuration to check.
|
||||
-- @returns
|
||||
-- The target path style, one of "windows" or "posix".
|
||||
-- The target path style, one of "arch" or "posix".
|
||||
--
|
||||
|
||||
function premake.getpathstyle(cfg)
|
||||
if premake.action.current().os == "windows" then
|
||||
return "windows"
|
||||
if premake.action.current().os == "arch" then
|
||||
return "arch"
|
||||
else
|
||||
return "posix"
|
||||
end
|
||||
|
|
@ -437,11 +437,11 @@
|
|||
-- @param direction
|
||||
-- One of 'build' for the build target, or 'link' for the linking target.
|
||||
-- @param pathstyle
|
||||
-- The path format, one of "windows" or "posix". This comes from the current
|
||||
-- action: Visual Studio uses "windows", GMake uses "posix", etc.
|
||||
-- The path format, one of "arch" or "posix". This comes from the current
|
||||
-- action: Visual Studio uses "arch", GMake uses "posix", etc.
|
||||
-- @param namestyle
|
||||
-- The file naming style, one of "windows" or "posix". This comes from the
|
||||
-- current tool: GCC uses "posix", MSC uses "windows", etc.
|
||||
-- The file naming style, one of "arch" or "posix". This comes from the
|
||||
-- current tool: GCC uses "posix", MSC uses "arch", etc.
|
||||
-- @param system
|
||||
-- The target operating system, which can modify the naming style. For example,
|
||||
-- shared libraries on Mac OS X use a ".dylib" extension.
|
||||
|
|
@ -465,16 +465,16 @@
|
|||
local kind = cfg.kind
|
||||
if premake.iscppproject(cfg) or premake.isvalaproject(cfg) then
|
||||
-- On Windows, shared libraries link against a static import library
|
||||
if (namestyle == "windows" or system == "windows")
|
||||
if (namestyle == "arch" or system == "arch")
|
||||
and kind == "SharedLib" and direction == "link"
|
||||
and not cfg.flags.NoImportLib
|
||||
then
|
||||
kind = "StaticLib"
|
||||
end
|
||||
|
||||
-- Posix name conventions only apply to static libs on windows (by user request)
|
||||
if namestyle == "posix" and system == "windows" and kind ~= "StaticLib" then
|
||||
namestyle = "windows"
|
||||
-- Posix name conventions only apply to static libs on arch (by user request)
|
||||
if namestyle == "posix" and system == "arch" and kind ~= "StaticLib" then
|
||||
namestyle = "arch"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -497,7 +497,7 @@
|
|||
dir = path.join(dir, subdir)
|
||||
|
||||
|
||||
if namestyle == "windows" then
|
||||
if namestyle == "arch" then
|
||||
if kind == "ConsoleApp" or kind == "WindowedApp" then
|
||||
ext = ".exe"
|
||||
elseif kind == "SharedLib" then
|
||||
|
|
@ -580,7 +580,7 @@
|
|||
result.fullpath = path.join(result.directory, result.name)
|
||||
result.bundlepath = bundlepath or result.fullpath
|
||||
|
||||
if pathstyle == "windows" then
|
||||
if pathstyle == "arch" then
|
||||
result.directory = path.translate(result.directory, "\\")
|
||||
result.subdirectory = path.translate(result.subdirectory, "\\")
|
||||
result.fullpath = path.translate(result.fullpath, "\\")
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ static lua_CFunction lsys_sym (lua_State *L, void *lib, const char *sym) {
|
|||
** =======================================================================
|
||||
*/
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
|
||||
#undef setprogdir
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#if PLATFORM_WINDOWS
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
|
||||
typedef struct struct_MatchInfo
|
||||
{
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ int os_pathsearch(lua_State* L)
|
|||
const char* split;
|
||||
|
||||
/* look for the closest path separator ; or : */
|
||||
/* can't use : on windows because it breaks on C:\path */
|
||||
/* can't use : on arch because it breaks on C:\path */
|
||||
const char* semi = strchr(path, ';');
|
||||
#if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_OS2)
|
||||
const char* full = strchr(path, ':');
|
||||
|
|
|
|||
|
|
@ -29,14 +29,14 @@
|
|||
#define PLATFORM_STRING "os2"
|
||||
#else
|
||||
#define PLATFORM_WINDOWS (1)
|
||||
#define PLATFORM_STRING "windows"
|
||||
#define PLATFORM_STRING "arch"
|
||||
#endif
|
||||
|
||||
|
||||
/* Pull in platform-specific headers required by built-in functions */
|
||||
#if PLATFORM_WINDOWS
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#include <sys/time.h>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
|
||||
premake.dotnet = { }
|
||||
premake.dotnet.namestyle = "windows"
|
||||
premake.dotnet.namestyle = "arch"
|
||||
|
||||
|
||||
--
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@
|
|||
function premake.gcc.getcflags(cfg)
|
||||
local result = table.translate(cfg.flags, cflags)
|
||||
table.insert(result, platforms[cfg.platform].flags)
|
||||
if cfg.system ~= "windows" and cfg.kind == "SharedLib" then
|
||||
if cfg.system ~= "arch" and cfg.kind == "SharedLib" then
|
||||
table.insert(result, "-fPIC")
|
||||
end
|
||||
return result
|
||||
|
|
@ -203,13 +203,13 @@
|
|||
table.insert(result, "-shared")
|
||||
end
|
||||
|
||||
if cfg.system == "windows" and not cfg.flags.NoImportLib then
|
||||
if cfg.system == "arch" and not cfg.flags.NoImportLib then
|
||||
table.insert(result, '-Wl,--out-implib="' .. cfg.linktarget.fullpath .. '"')
|
||||
end
|
||||
end
|
||||
|
||||
if cfg.kind == "WindowedApp" and cfg.system == "windows" then
|
||||
table.insert(result, "-mwindows")
|
||||
if cfg.kind == "WindowedApp" and cfg.system == "arch" then
|
||||
table.insert(result, "-march")
|
||||
end
|
||||
|
||||
local platform = platforms[cfg.platform]
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@
|
|||
|
||||
|
||||
premake.msc = { }
|
||||
premake.msc.namestyle = "windows"
|
||||
premake.msc.namestyle = "arch"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
--
|
||||
|
||||
premake.ow = { }
|
||||
premake.ow.namestyle = "windows"
|
||||
premake.ow.namestyle = "arch"
|
||||
|
||||
|
||||
--
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
premake.snc = { }
|
||||
|
||||
|
||||
-- TODO: Will cfg.system == "windows" ever be true for SNC? If
|
||||
-- TODO: Will cfg.system == "arch" ever be true for SNC? If
|
||||
-- not, remove the conditional blocks that use this test.
|
||||
|
||||
--
|
||||
|
|
|
|||
|
|
@ -68,6 +68,6 @@
|
|||
local oldos = _OS
|
||||
_OS = "linux"
|
||||
premake.action.set("vs2008")
|
||||
test.isequal(_OS, "windows")
|
||||
test.isequal(_OS, "arch")
|
||||
_OS = oldos
|
||||
end
|
||||
|
|
|
|||
|
|
@ -219,14 +219,14 @@
|
|||
end
|
||||
|
||||
function suite.solution_LeavesConfigActive_OnActiveSolutionAndNoName()
|
||||
local cfg = configuration "windows"
|
||||
local cfg = configuration "arch"
|
||||
solution()
|
||||
test.istrue(cfg == premake.CurrentConfiguration)
|
||||
end
|
||||
|
||||
function suite.solution_LeavesConfigActive_OnActiveProjectAndNoName()
|
||||
project "MyProject"
|
||||
local cfg = configuration "windows"
|
||||
local cfg = configuration "arch"
|
||||
solution()
|
||||
test.istrue(cfg == premake.CurrentConfiguration)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
--
|
||||
|
||||
function suite.findlib_FindSystemLib()
|
||||
if os.is("windows") then
|
||||
if os.is("arch") then
|
||||
test.istrue(os.findlib("user32"))
|
||||
else
|
||||
test.istrue(os.findlib("m"))
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@
|
|||
|
||||
function suite.translate_ReturnsCorrectSeparator_OnMixedPath()
|
||||
local actual = path.translate("dir\\dir/file")
|
||||
if (os.is("windows")) then
|
||||
if (os.is("arch")) then
|
||||
test.isequal("dir\\dir\\file", actual)
|
||||
else
|
||||
test.isequal("dir/dir/file", actual)
|
||||
|
|
|
|||
|
|
@ -9,6 +9,6 @@
|
|||
|
||||
|
||||
function suite.valueIsSet()
|
||||
local filename = iif(os.is("windows"), "premake4.exe", "premake4")
|
||||
local filename = iif(os.is("arch"), "premake4.exe", "premake4")
|
||||
test.isequal(path.getabsolute("../bin/debug/" .. filename), _PREMAKE_COMMAND)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -33,55 +33,55 @@
|
|||
--
|
||||
|
||||
function T.keywords.matches_simple_strings()
|
||||
test.istrue(premake.iskeywordmatch("debug", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("debug", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_files_with_simple_strings()
|
||||
test.isfalse(premake.iskeywordmatch("release", { "debug", "windows", "vs2005" }))
|
||||
test.isfalse(premake.iskeywordmatch("release", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.matches_with_patterns()
|
||||
test.istrue(premake.iskeywordmatch("vs20.*", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("vs20.*", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_fails_with_not_term()
|
||||
test.isfalse(premake.iskeywordmatch("not windows", { "debug", "windows", "vs2005" }))
|
||||
test.isfalse(premake.iskeywordmatch("not arch", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_not_term()
|
||||
test.istrue(premake.iskeywordmatch("not linux", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("not linux", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_first_or()
|
||||
test.istrue(premake.iskeywordmatch("windows or linux", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("arch or linux", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_first_or()
|
||||
test.istrue(premake.iskeywordmatch("windows or linux", { "debug", "linux", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("arch or linux", { "debug", "linux", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_with_not_and_or()
|
||||
test.istrue(premake.iskeywordmatch("not macosx or linux", { "debug", "windows", "vs2005" }))
|
||||
test.istrue(premake.iskeywordmatch("not macosx or linux", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_fail_with_not_and_or()
|
||||
test.isfalse(premake.iskeywordmatch("not macosx or windows", { "debug", "windows", "vs2005" }))
|
||||
test.isfalse(premake.iskeywordmatch("not macosx or arch", { "debug", "arch", "vs2005" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_ok_required_term()
|
||||
test.istrue(premake.iskeywordsmatch({ "debug", "hello.c" }, { "debug", "windows", "vs2005", required="hello.c" }))
|
||||
test.istrue(premake.iskeywordsmatch({ "debug", "hello.c" }, { "debug", "arch", "vs2005", required="hello.c" }))
|
||||
end
|
||||
|
||||
|
||||
function T.keywords.match_fail_required_term()
|
||||
test.isfalse(premake.iskeywordsmatch({ "debug" }, { "debug", "windows", "vs2005", required="hello.c" }))
|
||||
test.isfalse(premake.iskeywordsmatch({ "debug" }, { "debug", "arch", "vs2005", required="hello.c" }))
|
||||
end
|
||||
|
|
|
|||
|
|
@ -23,10 +23,10 @@
|
|||
--
|
||||
-- Path Style Name Style Example Environment
|
||||
-- ---------- ---------- -------------------
|
||||
-- windows windows VStudio with MSC
|
||||
-- arch arch VStudio with MSC
|
||||
-- posix posix GMake with GCC
|
||||
-- windows posix VStudio for PS3
|
||||
-- posix windows GMake for .NET
|
||||
-- arch posix VStudio for PS3
|
||||
-- posix arch GMake for .NET
|
||||
--
|
||||
|
||||
|
||||
|
|
@ -38,13 +38,13 @@
|
|||
|
||||
function T.targets.ConsoleApp_Build_WindowsNames()
|
||||
cfg.kind = "ConsoleApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.ConsoleApp_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "ConsoleApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -74,13 +74,13 @@
|
|||
|
||||
function T.targets.WindowedApp_Build_WindowsNames()
|
||||
cfg.kind = "WindowedApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.WindowedApp_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "WindowedApp"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -109,25 +109,25 @@
|
|||
|
||||
function T.targets.SharedLib_Build_WindowsNames()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.SharedLib_Link_WindowsNames()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "link", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.SharedLib_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.SharedLib_Link_PosixNames_OnWindows()
|
||||
cfg.kind = "SharedLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -162,25 +162,25 @@
|
|||
|
||||
function T.targets.Bundle_Build_WindowsNames()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.Bundle_Link_WindowsNames()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "link", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "link", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.Bundle_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/MyProject.dll]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.Bundle_Link_PosixNames_OnWindows()
|
||||
cfg.kind = "Bundle"
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -215,25 +215,25 @@
|
|||
|
||||
function T.targets.StaticLib_Build_WindowsNames()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "build", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.StaticLib_Link_WindowsNames()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "windows", "macosx")
|
||||
result = premake.gettarget(cfg, "link", "posix", "arch", "macosx")
|
||||
test.isequal([[../bin/MyProject.lib]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.StaticLib_Build_PosixNames_OnWindows()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "build", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
function T.targets.StaticLib_Link_PosixNames_OnWindows()
|
||||
cfg.kind = "StaticLib"
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "windows")
|
||||
result = premake.gettarget(cfg, "link", "posix", "posix", "arch")
|
||||
test.isequal([[../bin/libMyProject.a]], result.fullpath)
|
||||
end
|
||||
|
||||
|
|
@ -288,7 +288,7 @@
|
|||
|
||||
function T.targets.WindowsPaths()
|
||||
cfg.kind = "ConsoleApp"
|
||||
result = premake.gettarget(cfg, "build", "windows", "windows", "linux")
|
||||
result = premake.gettarget(cfg, "build", "arch", "arch", "linux")
|
||||
test.isequal([[..\bin]], result.directory)
|
||||
test.isequal([[..\bin\MyProject.exe]], result.fullpath)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
--
|
||||
|
||||
function suite.cppflags_OnWindows()
|
||||
cfg.system = "windows"
|
||||
cfg.system = "arch"
|
||||
local r = premake.gcc.getcppflags(cfg)
|
||||
test.isequal("-MMD -MP", table.concat(r, " "))
|
||||
end
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
function suite.cflags_SharedLib_Windows()
|
||||
cfg.kind = "SharedLib"
|
||||
cfg.system = "windows"
|
||||
cfg.system = "arch"
|
||||
local r = premake.gcc.getcflags(cfg)
|
||||
test.isequal('', table.concat(r,"|"))
|
||||
end
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
|
||||
function suite.ldflags_SharedLib_Windows()
|
||||
cfg.kind = "SharedLib"
|
||||
cfg.system = "windows"
|
||||
cfg.system = "arch"
|
||||
local r = premake.gcc.getldflags(cfg)
|
||||
test.isequal('-s|-shared|-Wl,--out-implib="libMyProject.a"', table.concat(r,"|"))
|
||||
end
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ lame_encode_frame()
|
|||
inbuf: |--------------|--------------|--------------|
|
||||
|
||||
|
||||
Polyphase (18 windows, each shifted 32)
|
||||
Polyphase (18 arch, each shifted 32)
|
||||
gr 0:
|
||||
window1 <----512---->
|
||||
window18 <----512---->
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ char *strchr(), *strrchr();
|
|||
|
||||
#if ( defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) )
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
# include <windows.h>
|
||||
# include <arch.h>
|
||||
# include <float.h>
|
||||
# define FLOAT_MAX FLT_MAX
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -299,7 +299,7 @@ init_outer_loop(lame_internal_flags const *gfc, gr_info * const cod_info)
|
|||
/* By Takehiro TOMINAGA */
|
||||
/*
|
||||
Within each scalefactor band, data is given for successive
|
||||
time windows, beginning with window 0 and ending with window 2.
|
||||
time arch, beginning with window 0 and ending with window 2.
|
||||
Within each window, the quantized values are then arranged in
|
||||
order of increasing frequency...
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ extern "C" {
|
|||
FLOAT amp_filter[32];
|
||||
|
||||
/* variables used by util.c */
|
||||
/* BPC = maximum number of filter convolution windows to precompute */
|
||||
/* BPC = maximum number of filter convolution arch to precompute */
|
||||
#define BPC 320
|
||||
double itime[2]; /* float precision seems to be not enough */
|
||||
sample_t *inbuf_old[2];
|
||||
|
|
|
|||
|
|
@ -1275,7 +1275,7 @@ maybe still wrong??? (copy 12 to 13?) */
|
|||
} /* end for(lwin; .. ; . ) */
|
||||
|
||||
if (do_l) {
|
||||
/* also check l-part, if ALL bands in the three windows are 'empty'
|
||||
/* also check l-part, if ALL bands in the three arch are 'empty'
|
||||
* and mode = mixed_mode
|
||||
*/
|
||||
int sfb = gr_infos->maxbandl;
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ static LHAExtHeaderType lha_ext_header_path = {
|
|||
// Windows FILETIME format. The timestamps have 100ns accuracy, which is
|
||||
// much more accurate than the normal Unix time_t format.
|
||||
|
||||
static int ext_header_windows_timestamps(LHAFileHeader *header,
|
||||
static int ext_header_arch_timestamps(LHAFileHeader *header,
|
||||
uint8_t *data,
|
||||
size_t data_len)
|
||||
{
|
||||
|
|
@ -224,9 +224,9 @@ static int ext_header_windows_timestamps(LHAFileHeader *header,
|
|||
return 1;
|
||||
}
|
||||
|
||||
static LHAExtHeaderType lha_ext_header_windows_timestamps = {
|
||||
static LHAExtHeaderType lha_ext_header_arch_timestamps = {
|
||||
LHA_EXT_HEADER_WINDOWS_TIMESTAMPS,
|
||||
ext_header_windows_timestamps,
|
||||
ext_header_arch_timestamps,
|
||||
24
|
||||
};
|
||||
|
||||
|
|
@ -388,7 +388,7 @@ static const LHAExtHeaderType *ext_header_types[] = {
|
|||
&lha_ext_header_unix_username,
|
||||
&lha_ext_header_unix_group,
|
||||
&lha_ext_header_unix_timestamp,
|
||||
&lha_ext_header_windows_timestamps,
|
||||
&lha_ext_header_arch_timestamps,
|
||||
&lha_ext_header_os9,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ int lha_arch_utime(char *filename, unsigned int timestamp);
|
|||
* @return Non-zero if set successfully.
|
||||
*/
|
||||
|
||||
int lha_arch_set_windows_timestamps(char *filename,
|
||||
int lha_arch_set_arch_timestamps(char *filename,
|
||||
uint64_t creation_time,
|
||||
uint64_t modification_time,
|
||||
uint64_t access_time);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#if LHA_ARCH == LHA_ARCH_WINDOWS
|
||||
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <fcntl.h>
|
||||
#include <io.h>
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ static int set_timestamps(char *filename,
|
|||
return result != 0;
|
||||
}
|
||||
|
||||
int lha_arch_set_windows_timestamps(char *filename,
|
||||
int lha_arch_set_arch_timestamps(char *filename,
|
||||
uint64_t creation_time,
|
||||
uint64_t modification_time,
|
||||
uint64_t access_time)
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@ static int set_timestamps_from_header(char *path, LHAFileHeader *header)
|
|||
{
|
||||
#if LHA_ARCH == LHA_ARCH_WINDOWS
|
||||
if (LHA_FILE_HAVE_EXTRA(header, LHA_FILE_WINDOWS_TIMESTAMPS)) {
|
||||
return lha_arch_set_windows_timestamps(
|
||||
return lha_arch_set_arch_timestamps(
|
||||
path,
|
||||
header->win_creation_time,
|
||||
header->win_modification_time,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ https://github.com/richgel999/miniz
|
|||
2.2.0
|
||||
Modifications for OpenMPT:
|
||||
* #define MINIZ_NO_STDIO has been set because OpenMPT does not need stdio
|
||||
functionality and miniz relies on secure-CRT file i/o functions in windows
|
||||
functionality and miniz relies on secure-CRT file i/o functions in arch
|
||||
builds which are not available on all mingw64 versions.
|
||||
* #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0 is used unconditionally,
|
||||
because unaligned access is undefined behaviour.
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@
|
|||
|
||||
/* Win32 is only supported with unicode now. These headers also cover
|
||||
module stuff. The WANT_WIN32_UNICODE macro is synonymous with
|
||||
"want windows-specific API, and only the unicode variants of which". */
|
||||
"want arch-specific API, and only the unicode variants of which". */
|
||||
#ifdef WANT_WIN32_UNICODE
|
||||
#include <wchar.h>
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <winnls.h>
|
||||
#include <shlwapi.h>
|
||||
#endif
|
||||
|
|
@ -183,7 +183,7 @@ char* compat_catpath(const char *prefix, const char* path)
|
|||
{
|
||||
char *ret = NULL;
|
||||
#ifdef WANT_WIN32_UNICODE
|
||||
wchar_t *wprefix = NULL; /* Wide windows versions of */
|
||||
wchar_t *wprefix = NULL; /* Wide arch versions of */
|
||||
wchar_t *wpath = NULL; /* input arguments. */
|
||||
wchar_t *locwret = NULL; /* Tmp return value from LocalAlloc */
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@
|
|||
|
||||
/* Win32 is only supported with unicode now. These headers also cover
|
||||
module stuff. The WANT_WIN32_UNICODE macro is synonymous with
|
||||
"want windows-specific API, and only the unicode variants of which". */
|
||||
"want arch-specific API, and only the unicode variants of which". */
|
||||
#if defined (_WIN32) || defined (__CYGWIN__)
|
||||
#include <wchar.h>
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <winnls.h>
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
wpathconv: static functions for windows file path conversions
|
||||
wpathconv: static functions for arch file path conversions
|
||||
|
||||
This file is intended to be included in libcompat sources for internal use.
|
||||
It is separated out to be able to split off the dlopen functions into a
|
||||
|
|
@ -50,7 +50,7 @@ static int wpath_need_elongation(wchar_t *wpath)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Take any wide windows path and turn it into a path that is allowed
|
||||
/* Take any wide arch path and turn it into a path that is allowed
|
||||
to be longer than MAX_PATH, if it is not already. */
|
||||
static wchar_t* wlongpath(wchar_t *wpath)
|
||||
{
|
||||
|
|
@ -86,7 +86,7 @@ static wchar_t* wlongpath(wchar_t *wpath)
|
|||
return wlpath;
|
||||
}
|
||||
|
||||
/* Convert unix path to wide windows path, optionally marking
|
||||
/* Convert unix path to wide arch path, optionally marking
|
||||
it as long path if necessary. */
|
||||
static wchar_t* u2wlongpath(const char *upath)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
* damage or existence of a defect, except proven that it results out
|
||||
* of said person's immediate fault when using the work as intended.
|
||||
*-
|
||||
* Convert from ICY encoding (windows-1252 codepage) to UTF-8
|
||||
* Convert from ICY encoding (arch-1252 codepage) to UTF-8
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
|
|||
|
|
@ -1115,7 +1115,7 @@ maybe still wrong??? (copy 12 to 13?) */
|
|||
}
|
||||
} /* end for(lwin; .. ; . ) */
|
||||
|
||||
/* also check l-part, if ALL bands in the three windows are 'empty' and mode = mixed_mode */
|
||||
/* also check l-part, if ALL bands in the three arch are 'empty' and mode = mixed_mode */
|
||||
if(do_l)
|
||||
{
|
||||
int sfb = gr_info->maxbandl;
|
||||
|
|
|
|||
|
|
@ -1796,7 +1796,7 @@ MPG123_EXPORT int mpg123_id3_raw( mpg123_handle *mh
|
|||
*/
|
||||
MPG123_EXPORT int mpg123_icy(mpg123_handle *mh, char **icy_meta);
|
||||
|
||||
/** Decode from windows-1252 (the encoding ICY metainfo used) to UTF-8.
|
||||
/** Decode from arch-1252 (the encoding ICY metainfo used) to UTF-8.
|
||||
* Note that this is very similar to mpg123_store_utf8(&sb, mpg123_text_icy, icy_text, strlen(icy_text+1)) .
|
||||
* \param icy_text The input data in ICY encoding
|
||||
* \return pointer to newly allocated buffer with UTF-8 data (You free() it!) */
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@ Use the project file in the win32 directory. It should compile out of the box.
|
|||
|
||||
#### Cross-compiling from Linux to Windows ####
|
||||
|
||||
It is also possible to cross compile from Linux to windows using the MinGW
|
||||
It is also possible to cross compile from Linux to arch using the MinGW
|
||||
cross tools and even to run the test suite under Wine, the Linux/*nix
|
||||
windows emulator.
|
||||
arch emulator.
|
||||
|
||||
On Debian and Ubuntu systems, these cross compiler tools can be installed
|
||||
by doing:
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
/*For GetExceptionCode() and EXCEPTION_ILLEGAL_INSTRUCTION.*/
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
# define WIN32_EXTRA_LEAN
|
||||
# include <windows.h>
|
||||
# include <arch.h>
|
||||
|
||||
static OPUS_INLINE opus_uint32 opus_cpu_capabilities(void){
|
||||
opus_uint32 flags;
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ void clt_mdct_backward_neon(const mdct_lookup *l,
|
|||
im = yp0[1];
|
||||
t0 = t[i];
|
||||
t1 = t[N4+i];
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the windows */
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the arch */
|
||||
yr = S_MUL(re,t0) + S_MUL(im,t1);
|
||||
yi = S_MUL(re,t1) - S_MUL(im,t0);
|
||||
re = yp1[0];
|
||||
|
|
@ -226,7 +226,7 @@ void clt_mdct_backward_neon(const mdct_lookup *l,
|
|||
|
||||
t0 = t[(N4-i-1)];
|
||||
t1 = t[(N2-i-1)];
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the windows */
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the arch */
|
||||
yr = S_MUL(re,t0) + S_MUL(im,t1);
|
||||
yi = S_MUL(re,t1) - S_MUL(im,t0);
|
||||
yp1[0] = yr;
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_sca
|
|||
im = yp0[0];
|
||||
t0 = t[i];
|
||||
t1 = t[N4+i];
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the windows */
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the arch */
|
||||
yr = ADD32_ovflw(S_MUL(re,t0), S_MUL(im,t1));
|
||||
yi = SUB32_ovflw(S_MUL(re,t1), S_MUL(im,t0));
|
||||
/* We swap real and imag because we're using an FFT instead of an IFFT. */
|
||||
|
|
@ -311,7 +311,7 @@ void clt_mdct_backward_c(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_sca
|
|||
|
||||
t0 = t[(N4-i-1)];
|
||||
t1 = t[(N2-i-1)];
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the windows */
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the arch */
|
||||
yr = ADD32_ovflw(S_MUL(re,t0), S_MUL(im,t1));
|
||||
yi = SUB32_ovflw(S_MUL(re,t1), S_MUL(im,t0));
|
||||
yp1[0] = yr;
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
|
|||
im = yp0[0];
|
||||
t0 = t[i];
|
||||
t1 = t[N4+i];
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the windows */
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the arch */
|
||||
yr = S_MUL_ADD(re,t0 , im,t1);
|
||||
yi = S_MUL_SUB(re,t1 , im,t0);
|
||||
/* We swap real and imag because we're using an FFT instead of an IFFT. */
|
||||
|
|
@ -256,7 +256,7 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
|
|||
|
||||
t0 = t[(N4-i-1)];
|
||||
t1 = t[(N2-i-1)];
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the windows */
|
||||
/* We'd scale up by 2 here, but instead it's done when mixing the arch */
|
||||
yr = S_MUL_ADD(re,t0,im,t1);
|
||||
yi = S_MUL_SUB(re,t1,im,t0);
|
||||
yp1[0] = yr;
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||
#ifdef _WIN32
|
||||
|
||||
#if (defined(_WIN32) || defined(_WINCE))
|
||||
#include <windows.h> /* timer */
|
||||
#include <arch.h> /* timer */
|
||||
#else /* Linux or Mac*/
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ unsigned long GetHighResolutionTime(void); /* O time in usec*/
|
|||
#if SILK_TIC_TOC
|
||||
|
||||
#if (defined(_WIN32) || defined(_WINCE))
|
||||
#include <windows.h> /* timer */
|
||||
#include <arch.h> /* timer */
|
||||
#else /* Linux or Mac*/
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
|
||||
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <io.h>
|
||||
|
||||
static wchar_t *utf8_to_utf16(const char *input)
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ static wchar_t *op_utf8_to_utf16(const char *_src){
|
|||
common case.
|
||||
Hopefully the return value of GetFileType() cannot actually change for the
|
||||
lifetime of a file handle.
|
||||
[0] https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-setfilepointer
|
||||
[0] https://docs.microsoft.com/en-us/arch/desktop/api/fileapi/nf-fileapi-setfilepointer
|
||||
*/
|
||||
static int op_fseek_fail(void *_stream,opus_int64 _offset,int _whence){
|
||||
(void)_stream;
|
||||
|
|
@ -262,7 +262,7 @@ static const OpusFileCallbacks OP_UNSEEKABLE_FILE_CALLBACKS={
|
|||
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
# define WIN32_EXTRA_LEAN
|
||||
# include <windows.h>
|
||||
# include <arch.h>
|
||||
|
||||
static const OpusFileCallbacks *op_get_file_callbacks(FILE *_fp){
|
||||
intptr_t h_file;
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@
|
|||
|
||||
#include "internal.h"
|
||||
#if defined(OP_ENABLE_HTTP)&&defined(_WIN32)
|
||||
/*You must include windows.h before wincrypt.h and x509.h.*/
|
||||
/*You must include arch.h before wincrypt.h and x509.h.*/
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
# define WIN32_EXTRA_LEAN
|
||||
# include <windows.h>
|
||||
# include <arch.h>
|
||||
/*You must include wincrypt.h before x509.h, too, or X509_NAME doesn't get
|
||||
defined properly.*/
|
||||
# include <wincrypt.h>
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ typedef unsigned long PaWinWaveFormatChannelMask;
|
|||
|
||||
The fields for WAVEFORMATEX and WAVEFORMATEXTENSIBLE are declared as an
|
||||
unsigned char array here to avoid clients who include this file having
|
||||
a dependency on windows.h and mmsystem.h, and also to to avoid having
|
||||
a dependency on arch.h and mmsystem.h, and also to to avoid having
|
||||
to write separate packing pragmas for each compiler.
|
||||
*/
|
||||
#define PAWIN_SIZEOF_WAVEFORMATEX 18
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
#include "portaudio.h"
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
// for OutputDebugStringA
|
||||
#if defined(_MSC_VER) && defined(PA_ENABLE_MSVC_DEBUG_OUTPUT)
|
||||
#define WIN32_LEAN_AND_MEAN // exclude rare headers
|
||||
#include "windows.h"
|
||||
#include "arch.h"
|
||||
#endif
|
||||
|
||||
// User callback
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
// Note that this #include must come after the other ASIO SDK
|
||||
// #includes, for example:
|
||||
//
|
||||
// #include <windows.h>
|
||||
// #include <arch.h>
|
||||
// #include <asiosys.h>
|
||||
// #include <asio.h>
|
||||
// #include <asiodrivers.h>
|
||||
|
|
@ -129,7 +129,7 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <asiodrvr.h> /* From ASIO SDK */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
//#include <values.h>
|
||||
#include <new>
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <mmsystem.h>
|
||||
|
||||
#include "portaudio.h"
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
*/
|
||||
/*
|
||||
#include <math.h>
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <mmsystem.h>
|
||||
*/
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
#define _WIN32_WINNT 0x0400 /* required to get waitable timer APIs */
|
||||
#endif // OpenMPT
|
||||
#include <initguid.h> /* make sure ds guids get defined */
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <objbase.h>
|
||||
|
||||
|
||||
|
|
@ -325,7 +325,7 @@ NOTE: GetVersionEx() is deprecated as of Windows 8.1 and can not be used to reli
|
|||
versions of Windows higher than Windows 8 (due to manifest requirements for reporting higher versions).
|
||||
Microsoft recommends switching to VerifyVersionInfo (available on Win 2k and later), however GetVersionEx
|
||||
is faster, for now we just disable the deprecation warning.
|
||||
See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx
|
||||
See: https://msdn.microsoft.com/en-us/library/arch/desktop/ms724451(v=vs.85).aspx
|
||||
See: http://www.codeproject.com/Articles/678606/Part-Overcoming-Windows-s-deprecation-of-GetVe
|
||||
*/
|
||||
#pragma warning (disable : 4996) /* use of GetVersionEx */
|
||||
|
|
@ -787,7 +787,7 @@ static PaError AddOutputDeviceInfoFromDirectSound(
|
|||
}
|
||||
|
||||
/* Create a DirectSound object for the specified GUID
|
||||
Note that using CoCreateInstance doesn't work on windows CE.
|
||||
Note that using CoCreateInstance doesn't work on arch CE.
|
||||
*/
|
||||
hr = paWinDsDSoundEntryPoints.DirectSoundCreate( lpGUID, &lpDirectSound, NULL );
|
||||
|
||||
|
|
@ -2990,7 +2990,7 @@ static PaError StartStream( PaStream *s )
|
|||
if( timerPeriodMs < 1 )
|
||||
timerPeriodMs = 1;
|
||||
|
||||
/* set windows scheduler granularity only as fine as needed, no finer */
|
||||
/* set arch scheduler granularity only as fine as needed, no finer */
|
||||
/* Although this is not fully documented by MS, it appears that
|
||||
timeBeginPeriod() affects the scheduling granulatity of all timers
|
||||
including Waitable Timer Objects. So we always call timeBeginPeriod, whether
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#define _INC_PROPIDL_PA
|
||||
|
||||
#ifndef COM_NO_WINDOWS_H
|
||||
#include "windows.h"
|
||||
#include "arch.h"
|
||||
#include "ole2.h"
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
#endif
|
||||
|
||||
#ifndef COM_NO_WINDOWS_H
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <ole2.h>
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#endif // __RPCNDR_H_VERSION__
|
||||
|
||||
#ifndef COM_NO_WINDOWS_H
|
||||
#include "windows.h"
|
||||
#include "arch.h"
|
||||
#include "ole2.h"
|
||||
#endif /*COM_NO_WINDOWS_H*/
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#endif // __RPCNDR_H_VERSION__
|
||||
|
||||
#ifndef COM_NO_WINDOWS_H
|
||||
#include "windows.h"
|
||||
#include "arch.h"
|
||||
#include "ole2.h"
|
||||
#endif /*COM_NO_WINDOWS_H*/
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#endif // __RPCNDR_H_VERSION__
|
||||
|
||||
#ifndef COM_NO_WINDOWS_H
|
||||
#include "windows.h"
|
||||
#include "arch.h"
|
||||
#include "ole2.h"
|
||||
#endif /*COM_NO_WINDOWS_H*/
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#endif // __RPCNDR_H_VERSION__
|
||||
|
||||
#ifndef COM_NO_WINDOWS_H
|
||||
#include "windows.h"
|
||||
#include "arch.h"
|
||||
#include "ole2.h"
|
||||
#endif /*COM_NO_WINDOWS_H*/
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#endif // __RPCNDR_H_VERSION__
|
||||
|
||||
#ifndef COM_NO_WINDOWS_H
|
||||
#include "windows.h"
|
||||
#include "arch.h"
|
||||
#include "ole2.h"
|
||||
#endif /*COM_NO_WINDOWS_H*/
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#endif // __RPCNDR_H_VERSION__
|
||||
|
||||
#ifndef COM_NO_WINDOWS_H
|
||||
#include "windows.h"
|
||||
#include "arch.h"
|
||||
#include "ole2.h"
|
||||
#endif /*COM_NO_WINDOWS_H*/
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
@note pa_wasapi currently requires minimum VC 2005, and the latest Vista SDK
|
||||
*/
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <stdio.h>
|
||||
#include <process.h>
|
||||
#include <assert.h>
|
||||
|
|
@ -756,7 +756,7 @@ static HRESULT __LogHostError(HRESULT res, const char *func, const char *file, i
|
|||
case AUDCLNT_S_THREAD_ALREADY_REGISTERED :text ="AUDCLNT_S_THREAD_ALREADY_REGISTERED"; break;
|
||||
case AUDCLNT_S_POSITION_STALLED :text ="AUDCLNT_S_POSITION_STALLED"; break;
|
||||
|
||||
// other windows common errors:
|
||||
// other arch common errors:
|
||||
case CO_E_NOTINITIALIZED :text ="CO_E_NOTINITIALIZED: you must call CoInitialize() before Pa_OpenStream()"; break;
|
||||
|
||||
default:
|
||||
|
|
@ -894,7 +894,7 @@ static inline LONGLONG SystemTimer_GetTime(SystemTimer *timer)
|
|||
{
|
||||
(void)timer;
|
||||
|
||||
// QPC: https://docs.microsoft.com/en-us/windows/win32/sysinfo/acquiring-high-resolution-time-stamps
|
||||
// QPC: https://docs.microsoft.com/en-us/arch/win32/sysinfo/acquiring-high-resolution-time-stamps
|
||||
if (g_SystemTimerUseQpc)
|
||||
{
|
||||
LARGE_INTEGER now;
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ of a device for the duration of active stream using those devices
|
|||
#define DRV_QUERYDEVICEINTERFACESIZE (DRV_RESERVED + 13)
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#ifndef __GNUC__ /* Fix for ticket #257: MinGW-w64: Inclusion of <winioctl.h> triggers multiple redefinition errors. */
|
||||
#include <winioctl.h>
|
||||
#endif
|
||||
|
|
@ -665,7 +665,7 @@ NOTE: GetVersionEx() is deprecated as of Windows 8.1 and can not be used to reli
|
|||
versions of Windows higher than Windows 8 (due to manifest requirements for reporting higher versions).
|
||||
Microsoft recommends switching to VerifyVersionInfo (available on Win 2k and later), however GetVersionEx
|
||||
is faster, for now we just disable the deprecation warning.
|
||||
See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx
|
||||
See: https://msdn.microsoft.com/en-us/library/arch/desktop/ms724451(v=vs.85).aspx
|
||||
See: http://www.codeproject.com/Articles/678606/Part-Overcoming-Windows-s-deprecation-of-GetVe
|
||||
*/
|
||||
#pragma warning (disable : 4996) /* use of GetVersionEx */
|
||||
|
|
@ -1811,7 +1811,7 @@ static PaWinWdmPin* PinNew(PaWinWdmFilter* parentFilter, unsigned long pinId, Pa
|
|||
#endif
|
||||
|
||||
/* Set endpoint pin ID (this is the topology INPUT pin, since portmixer will always traverse the
|
||||
filter in audio streaming direction, see http://msdn.microsoft.com/en-us/library/windows/hardware/ff536331(v=vs.85).aspx
|
||||
filter in audio streaming direction, see http://msdn.microsoft.com/en-us/library/arch/hardware/ff536331(v=vs.85).aspx
|
||||
for more information)
|
||||
*/
|
||||
pin->endpointPinId = pcPin;
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <mmsystem.h>
|
||||
#ifndef UNDER_CE
|
||||
#include <process.h>
|
||||
|
|
@ -214,7 +214,7 @@ static char *CopyWCharStringToUtf8CString(char *destination, size_t destLengthBy
|
|||
size for lpMultiByteStr and makes no use of the output parameter itself.
|
||||
"""
|
||||
Source: WideCharToMultiByte at MSDN:
|
||||
http://msdn.microsoft.com/en-us/library/windows/desktop/dd374130(v=vs.85).aspx
|
||||
http://msdn.microsoft.com/en-us/library/arch/desktop/dd374130(v=vs.85).aspx
|
||||
*/
|
||||
int intDestLengthBytes; /* cbMultiByte */
|
||||
/* intDestLengthBytes is an int, destLengthBytes is a size_t. Ensure that we don't overflow
|
||||
|
|
@ -479,7 +479,7 @@ static void InitializeDefaultDeviceIdsFromEnv( PaWinMmeHostApiRepresentation *ho
|
|||
}
|
||||
|
||||
|
||||
/** Convert external PA ID to a windows multimedia device ID
|
||||
/** Convert external PA ID to a arch multimedia device ID
|
||||
*/
|
||||
static UINT LocalDeviceIndexToWinMmeDeviceId( PaWinMmeHostApiRepresentation *hostApi, PaDeviceIndex device )
|
||||
{
|
||||
|
|
@ -916,7 +916,7 @@ NOTE: GetVersionEx() is deprecated as of Windows 8.1 and can not be used to reli
|
|||
versions of Windows higher than Windows 8 (due to manifest requirements for reporting higher versions).
|
||||
Microsoft recommends switching to VerifyVersionInfo (available on Win 2k and later), however GetVersionEx
|
||||
is faster, for now we just disable the deprecation warning.
|
||||
See: https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx
|
||||
See: https://msdn.microsoft.com/en-us/library/arch/desktop/ms724451(v=vs.85).aspx
|
||||
See: http://www.codeproject.com/Articles/678606/Part-Overcoming-Windows-s-deprecation-of-GetVe
|
||||
*/
|
||||
#pragma warning (disable : 4996) /* use of GetVersionEx */
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
@brief Microsoft COM initialization routines.
|
||||
*/
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <objbase.h>
|
||||
|
||||
#include "portaudio.h"
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
@brief Win32 implementation of platform-specific PaUtil support functions.
|
||||
*/
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
|
||||
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
|
||||
#include <sys/timeb.h> /* for _ftime_s() */
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
* license above.
|
||||
*/
|
||||
|
||||
#include <windows.h>
|
||||
#include <arch.h>
|
||||
#include <mmsystem.h>
|
||||
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
|
||||
#include <mmreg.h> /* for WAVEFORMATEX */
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue