Skip to content

Commit 65b9eff

Browse files
danoli3danoli3
authored
[feature] Visual Studio 2022 (ARM64EC, ARM64, x64) (#7843)
* Bleeding Edge Latest Libraries Download / Install -b (cherry picked from commit 007a886) * VS workflow * VS Project update 2022 * emscripten uri static * emscripten disabled * vs cairo depends * Updates to VS props * Addons template test update * VS2022 ARM64 * VS2022 ARM64 fixes * vs2022 ARM64EC * VS Project updated to fix linking issues * VS MSVC ARM64/ARM64EC instrinicts fix with NEON libraries * VS Debug fix videoInput * VS Template Fixes for ARM64EC, ARM64, x64 targets * vs download_libs no -b * VS bleeding install and workflows * Platforms * download libs fix -b * Bleeding libs * VS Bits * VS Randomised Base Fix * Random base fix vs * DynamicBase YES * Fix android actions * VS2022 multi target DLL fix * VS2022 Fixes for configuration, copy DLLs event and showing all default targets * FreeType MD/MT issue fix (recompiled libs) ARM targets disabled FMOD no sound currently - issue Buffer security fix ARM64EC (required) * Download libs fix * GLM 9.9.9 fix * GLM 9.9.9.9 define * ARM64EC workflow * GLM 9.9.9.9 Fix for addon / missed * Core Missing Files VS Project * Core Missing Files VS Project - ofBaseMateriaTtypes * Core Missing Files VS Project / Remove GLM define in VS for now * VS Fixes for ofConstants for Sound and ARM SIMD include. Remove code using test case on x64 * ARM64 / ARM64EC VS Fixed to use OF_NO_FMOD Sound via MEDIA_FOUNDATION * VS Template - Order for x64 default
1 parent b69d27e commit 65b9eff

60 files changed

Lines changed: 719 additions & 79 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/build-android.yml renamed to .github/disabled/build-android.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
build-android:
19-
runs-on: ubuntu-18.04
19+
runs-on: ubuntu-20.04
2020
strategy:
2121
matrix:
2222
cfg:
@@ -45,7 +45,5 @@ jobs:
4545
run: ./scripts/$TARGET/download_libs.sh
4646
- name: Build
4747
run: ./scripts/ci/$TARGET/build.sh
48-
- name: Upload Libs
49-
run: scripts/ci/upload_of_lib.sh;
5048
env:
5149
GA_CI_SECRET: ${{ secrets.CI_SECRET }}

.github/workflows/build-vs.yml renamed to .github/disabled/build-vs2019.yml

File renamed without changes.

‎.github/workflows/build-vs2022.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: build-vs
2+
3+
# make the action not run on the local repo if the branch is also in a pull request to OF/OF
4+
on:
5+
push:
6+
if: github.event_name == 'push' && github.event.pull_request == null
7+
paths-ignore:
8+
- '**/*.md'
9+
- 'examples/**'
10+
pull_request:
11+
if: github.event_name == 'pull_request' && github.repository == 'openframeworks/openFrameworks'
12+
paths-ignore:
13+
- '**/*.md'
14+
- 'examples/**'
15+
16+
concurrency:
17+
group: ${{ github.workflow }}-${{ github.ref }}
18+
cancel-in-progress: true
19+
20+
jobs:
21+
build-vs2022:
22+
runs-on: windows-2022
23+
strategy:
24+
matrix:
25+
platform: [x64, ARM64, ARM64EC]
26+
env:
27+
BITS: ${{ matrix.bits }}
28+
steps:
29+
- name: Clone repository
30+
uses: actions/checkout@v4
31+
- uses: msys2/setup-msys2@v2
32+
with:
33+
update: true
34+
install: >-
35+
git
36+
unzip
37+
rsync
38+
wget
39+
- name: Install dependencies
40+
shell: msys2 {0}
41+
run:
42+
./scripts/ci/vs/install_bleeding.sh
43+
- name: Setup MSBuild
44+
uses: microsoft/setup-msbuild@v1.1
45+
- name: Build emptyExample
46+
working-directory: ${{env.GITHUB_WORKSPACE}}
47+
run:
48+
msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
49+
- name: Build allAddonsExample
50+
working-directory: ${{env.GITHUB_WORKSPACE}}
51+
run:
52+
msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
53+
54+

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,5 @@ Desktop.ini
135135
/apps*/
136136
projectGenerator*/
137137
.cxx/
138+
libs/openFrameworksCompiled/project/vs/.vs/
139+
scripts/templates/vs/.vs/

‎addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#include "ofxAssimpTexture.h"
1313
#include "ofVbo.h"
1414
#include "ofMesh.h"
15+
#define GLM_FORCE_CTOR_INIT
16+
#define GLM_ENABLE_EXPERIMENTAL
1517
#include "glm/mat4x4.hpp"
1618

1719
struct aiMesh;

‎examples/templates/allAddonsExample/addons.make‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
ofxAssimpModelLoader
2+
ofxGui
3+
ofxKinect
24
ofxNetwork
35
ofxOpenCv
46
ofxOsc
5-
ofxXmlSettings
6-
ofxThreadedImageLoader
7-
ofxGui
8-
ofxKinect
97
ofxSvg
10-
ofxPoco
8+
ofxThreadedImageLoader
9+
ofxXmlSettings

‎examples/templates/allAddonsExample/src/ofApp.h‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "ofxKinect.h"
1010
#include "ofxGui.h"
1111
#include "ofxSvg.h"
12-
#include "ofxXmlPoco.h"
1312
#include "ofMain.h"
1413

1514
class ofApp : public ofBaseApp{
@@ -41,10 +40,9 @@ class ofApp : public ofBaseApp{
4140
ofxTCPServer server;
4241
ofxOscSender osc_sender;
4342
ofxXmlSettings settings;
44-
ofxAssimpModelLoader betterModelLoader;
45-
ofxThreadedImageLoader threadedLoader;
46-
ofxKinect kinect;
47-
ofxPanel gui;
48-
ofxSvg svg;
49-
ofxXmlPoco xml;
43+
ofxAssimpModelLoader betterModelLoader;
44+
ofxThreadedImageLoader threadedLoader;
45+
ofxKinect kinect;
46+
ofxPanel gui;
47+
ofxSvg svg;
5048
};

‎libs/openFrameworks/3d/of3dUtils.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
#define GLM_FORCE_CTOR_INIT
4+
#define GLM_ENABLE_EXPERIMENTAL
45
#include "glm/vec3.hpp"
56

67
/// \brief Draws x,y,z axes representing the current reference frame.

‎libs/openFrameworks/3d/ofCamera.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "ofGraphics.h"
33

44
#define GLM_FORCE_CTOR_INIT
5+
#define GLM_ENABLE_EXPERIMENTAL
56
#include "glm/gtx/transform.hpp"
67
#include "glm/gtc/quaternion.hpp"
78
#include "of3dGraphics.h"

‎libs/openFrameworks/3d/ofEasyCam.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "ofGraphicsBaseTypes.h"
55

66
#define GLM_FORCE_CTOR_INIT
7+
#define GLM_ENABLE_EXPERIMENTAL
78
#include "glm/gtx/vector_angle.hpp"
89
#include <limits>
910

0 commit comments

Comments
 (0)