From b069d672b3c75f9f251c008bddcaa974959f2a84 Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 24 Feb 2025 13:18:58 +0100 Subject: [PATCH] [GLVM] Cleanup --- src/GLVM/CMakeLists.txt | 2 +- src/GLVM/Makefile | 22 ---------------- src/GLVM/MakefileMac | 22 ---------------- src/GLVM/ReadMe.txt | 48 ----------------------------------- src/GLVM/dllmain.cpp | 19 -------------- src/GLVM/glvm.vcxproj | 17 ------------- src/GLVM/glvm.vcxproj.filters | 6 ----- src/GLVM/targetver.h | 2 ++ 8 files changed, 3 insertions(+), 135 deletions(-) delete mode 100644 src/GLVM/Makefile delete mode 100644 src/GLVM/MakefileMac delete mode 100644 src/GLVM/ReadMe.txt delete mode 100644 src/GLVM/dllmain.cpp diff --git a/src/GLVM/CMakeLists.txt b/src/GLVM/CMakeLists.txt index 4a707fa96..db1e040fb 100644 --- a/src/GLVM/CMakeLists.txt +++ b/src/GLVM/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.10) project(glvm LANGUAGES CXX) if(WIN32) diff --git a/src/GLVM/Makefile b/src/GLVM/Makefile deleted file mode 100644 index 39076b7fb..000000000 --- a/src/GLVM/Makefile +++ /dev/null @@ -1,22 +0,0 @@ - -all: deploy - -deploy: glvm.so - cp glvm.so ../../lib/Native/Aardvark.Rendering.GL/linux/AMD64/glvm.so - cp glvm.so ../../bin/Debug/glvm.so - cp glvm.so ../../bin/Release/glvm.so - -glvm.o: glvm.cpp glvm.h - g++ -std=c++11 -fPIC -c glvm.cpp -o glvm.o - -State.o: State.cpp State.h - g++ -std=c++11 -fPIC -c State.cpp -o State.o - -glvm.so: glvm.o State.o - g++ State.o glvm.o -shared -o glvm.so -lGL - -glvm.dylib: glvm.o State.o - g++ State.o glvm.o -shared -o glvm.dylib -framework OpenGL - -.PHONY clean: - rm -fr *.o glvm.so diff --git a/src/GLVM/MakefileMac b/src/GLVM/MakefileMac deleted file mode 100644 index a6de366bd..000000000 --- a/src/GLVM/MakefileMac +++ /dev/null @@ -1,22 +0,0 @@ -arch = $(shell uname -m) - -all: deploy - -deploy: glvm.dylib - mkdir -p "../../lib/Native/Aardvark.Rendering.GL/mac/$(arch)/" && cp glvm.dylib ../../lib/Native/Aardvark.Rendering.GL/mac/$(arch)/glvm.dylib - mkdir -p "../../bin/Debug/netcoreapp3.0/" && cp glvm.dylib ../../bin/Debug/netcoreapp3.0/glvm.dylib - mkdir -p "../../bin/Release/netcoreapp3.0/" && cp glvm.dylib ../../bin/Release/netcoreapp3.0/glvm.dylib - mkdir -p "../../bin/Debug/netcoreapp3.1/" && cp glvm.dylib ../../bin/Debug/netcoreapp3.1/glvm.dylib - mkdir -p "../../bin/Release/netcoreapp3.1/" && cp glvm.dylib ../../bin/Release/netcoreapp3.1/glvm.dylib - -glvm.o: glvm.cpp glvm.h - g++ -std=c++11 -fPIC -c glvm.cpp -o glvm.o - -State.o: State.cpp State.h - g++ -std=c++11 -fPIC -c State.cpp -o State.o - -glvm.dylib: glvm.o State.o - g++ State.o glvm.o -shared -o glvm.dylib -framework OpenGL - -.PHONY clean: - rm -fr *.o glvm.dylib diff --git a/src/GLVM/ReadMe.txt b/src/GLVM/ReadMe.txt deleted file mode 100644 index c2bd34bbb..000000000 --- a/src/GLVM/ReadMe.txt +++ /dev/null @@ -1,48 +0,0 @@ -======================================================================== - DYNAMIC LINK LIBRARY : glvm Project Overview -======================================================================== - -AppWizard has created this glvm DLL for you. - -This file contains a summary of what you will find in each of the files that -make up your glvm application. - - -glvm.vcxproj - This is the main project file for VC++ projects generated using an Application Wizard. - It contains information about the version of Visual C++ that generated the file, and - information about the platforms, configurations, and project features selected with the - Application Wizard. - -glvm.vcxproj.filters - This is the filters file for VC++ projects generated using an Application Wizard. - It contains information about the association between the files in your project - and the filters. This association is used in the IDE to show grouping of files with - similar extensions under a specific node (for e.g. ".cpp" files are associated with the - "Source Files" filter). - -glvm.cpp - This is the main DLL source file. - - When created, this DLL does not export any symbols. As a result, it - will not produce a .lib file when it is built. If you wish this project - to be a project dependency of some other project, you will either need to - add code to export some symbols from the DLL so that an export library - will be produced, or you can set the Ignore Input Library property to Yes - on the General propert page of the Linker folder in the project's Property - Pages dialog box. - -///////////////////////////////////////////////////////////////////////////// -Other standard files: - -StdAfx.h, StdAfx.cpp - These files are used to build a precompiled header (PCH) file - named glvm.pch and a precompiled types file named StdAfx.obj. - -///////////////////////////////////////////////////////////////////////////// -Other notes: - -AppWizard uses "TODO:" comments to indicate parts of the source code you -should add to or customize. - -///////////////////////////////////////////////////////////////////////////// diff --git a/src/GLVM/dllmain.cpp b/src/GLVM/dllmain.cpp deleted file mode 100644 index 69b58914b..000000000 --- a/src/GLVM/dllmain.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// dllmain.cpp : Defines the entry point for the DLL application. -#include "stdafx.h" - -BOOL APIENTRY DllMain( HMODULE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) -{ - switch (ul_reason_for_call) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - diff --git a/src/GLVM/glvm.vcxproj b/src/GLVM/glvm.vcxproj index d227e3997..9ca9b2926 100644 --- a/src/GLVM/glvm.vcxproj +++ b/src/GLVM/glvm.vcxproj @@ -201,9 +201,6 @@ - - - @@ -212,20 +209,6 @@ - - false - false - - - - - false - false - - - - - diff --git a/src/GLVM/glvm.vcxproj.filters b/src/GLVM/glvm.vcxproj.filters index 413f1cf26..f89b824c6 100644 --- a/src/GLVM/glvm.vcxproj.filters +++ b/src/GLVM/glvm.vcxproj.filters @@ -14,9 +14,6 @@ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - Header Files @@ -41,9 +38,6 @@ Source Files - - Source Files - Source Files diff --git a/src/GLVM/targetver.h b/src/GLVM/targetver.h index 87c0086de..233eed461 100644 --- a/src/GLVM/targetver.h +++ b/src/GLVM/targetver.h @@ -5,4 +5,6 @@ // If you wish to build your application for a previous Windows platform, include WinSDKVer.h and // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. +#include +#define _WIN32_WINNT _WIN32_WINNT_WIN10 #include