temp knock out projects that have yet to be ported. main lib compiles

This commit is contained in:
Reece Wilson 2020-09-12 02:01:33 +01:00
parent 88c8e81528
commit 558697577a
10 changed files with 63 additions and 272 deletions

View File

@ -75,6 +75,9 @@ if (WIN32)
if(BUILD_DX12)
set(LIBRARY_SOURCES ${LIBRARY_SOURCES} DirectXTex/DirectXTexD3D12.cpp)
endif()
else()
set(LIBRARY_SOURCES ${LIBRARY_SOURCES} DirectXTex/DirectXTexCompress.cpp)
endif()
@ -123,22 +126,22 @@ if(MSVC)
string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
endif()
add_executable(texassemble
Texassemble/texassemble.cpp
Texassemble/AnimatedGif.cpp)
target_link_libraries(texassemble ${PROJECT_NAME} version.lib)
source_group(texassemble REGULAR_EXPRESSION Texassemble/*.*)
#add_executable(texassemble
# Texassemble/texassemble.cpp
# Texassemble/AnimatedGif.cpp)
#target_link_libraries(texassemble ${PROJECT_NAME} version.lib)
#source_group(texassemble REGULAR_EXPRESSION Texassemble/*.*)
add_executable(texconv
Texconv/texconv.cpp
Texconv/ExtendedBMP.cpp
Texconv/PortablePixMap.cpp)
target_link_libraries(texconv ${PROJECT_NAME} version.lib)
source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
#add_executable(texconv
# Texconv/texconv.cpp
# Texconv/ExtendedBMP.cpp
# Texconv/PortablePixMap.cpp)
#target_link_libraries(texconv ${PROJECT_NAME} version.lib)
#source_group(texconv REGULAR_EXPRESSION Texconv/*.*)
add_executable(texdiag Texdiag/texdiag.cpp)
target_link_libraries(texdiag ${PROJECT_NAME} version.lib)
source_group(texdiag REGULAR_EXPRESSION Texdiag/*.*)
# add_executable(texdiag Texdiag/texdiag.cpp)
# target_link_libraries(texdiag ${PROJECT_NAME} version.lib)
# source_group(texdiag REGULAR_EXPRESSION Texdiag/*.*)
if(MSVC)
target_compile_options(${PROJECT_NAME} PRIVATE /fp:fast)
@ -163,9 +166,9 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
# OpenMP is not supported for clang for Windows by default
set(WarningsEXE ${WarningsLib} "-Wno-c++98-compat" "-Wno-c++98-compat-pedantic" "-Wno-switch" "-Wno-switch-enum" "-Wno-language-extension-token" "-Wno-missing-prototypes")
target_compile_options(texassemble PRIVATE ${WarningsEXE})
target_compile_options(texconv PRIVATE ${WarningsEXE})
target_compile_options(texdiag PRIVATE ${WarningsEXE} "-Wno-double-promotion" )
#target_compile_options(texassemble PRIVATE ${WarningsEXE})
#target_compile_options(texconv PRIVATE ${WarningsEXE})
#target_compile_options(texdiag PRIVATE ${WarningsEXE} "-Wno-double-promotion" )
endif()
if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
target_compile_options(${PROJECT_NAME} PRIVATE /permissive- /JMC- /Zc:__cplusplus)
@ -200,6 +203,7 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
endif()
target_compile_definitions(${PROJECT_NAME} PRIVATE ${PLATFORM_FLAGS})
# target_compile_definitions(texdiag PRIVATE ${PLATFORM_FLAGS})
if(WIN32)
target_compile_definitions(${PROJECT_NAME} PRIVATE _UNICODE UNICODE)
target_compile_definitions(texassemble PRIVATE _UNICODE UNICODE _WIN32_WINNT=0x0601)

274
Makefile
View File

@ -75,17 +75,6 @@ CMAKE_BINARY_DIR = /run/media/reece/Misc/GameEngine/Master/Public/DirectXTex
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache
# Special rule for the target edit_cache
edit_cache/fast: edit_cache
.PHONY : edit_cache/fast
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
@ -97,6 +86,17 @@ rebuild_cache/fast: rebuild_cache
.PHONY : rebuild_cache/fast
# Special rule for the target edit_cache
edit_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache
# Special rule for the target edit_cache
edit_cache/fast: edit_cache
.PHONY : edit_cache/fast
# The main all target
all: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /run/media/reece/Misc/GameEngine/Master/Public/DirectXTex/CMakeFiles /run/media/reece/Misc/GameEngine/Master/Public/DirectXTex//CMakeFiles/progress.marks
@ -129,45 +129,6 @@ depend:
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
#=============================================================================
# Target rules for targets named texdiag
# Build rule for target.
texdiag: cmake_check_build_system
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 texdiag
.PHONY : texdiag
# fast build rule for target.
texdiag/fast:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texdiag.dir/build.make CMakeFiles/texdiag.dir/build
.PHONY : texdiag/fast
#=============================================================================
# Target rules for targets named texconv
# Build rule for target.
texconv: cmake_check_build_system
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 texconv
.PHONY : texconv
# fast build rule for target.
texconv/fast:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/build
.PHONY : texconv/fast
#=============================================================================
# Target rules for targets named texassemble
# Build rule for target.
texassemble: cmake_check_build_system
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 texassemble
.PHONY : texassemble
# fast build rule for target.
texassemble/fast:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texassemble.dir/build.make CMakeFiles/texassemble.dir/build
.PHONY : texassemble/fast
#=============================================================================
# Target rules for targets named DirectXTex
@ -262,6 +223,33 @@ DirectXTex/BC6HBC7.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/DirectXTex.dir/build.make CMakeFiles/DirectXTex.dir/DirectXTex/BC6HBC7.cpp.s
.PHONY : DirectXTex/BC6HBC7.cpp.s
DirectXTex/DirectXTexCompress.o: DirectXTex/DirectXTexCompress.cpp.o
.PHONY : DirectXTex/DirectXTexCompress.o
# target to build an object file
DirectXTex/DirectXTexCompress.cpp.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/DirectXTex.dir/build.make CMakeFiles/DirectXTex.dir/DirectXTex/DirectXTexCompress.cpp.o
.PHONY : DirectXTex/DirectXTexCompress.cpp.o
DirectXTex/DirectXTexCompress.i: DirectXTex/DirectXTexCompress.cpp.i
.PHONY : DirectXTex/DirectXTexCompress.i
# target to preprocess a source file
DirectXTex/DirectXTexCompress.cpp.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/DirectXTex.dir/build.make CMakeFiles/DirectXTex.dir/DirectXTex/DirectXTexCompress.cpp.i
.PHONY : DirectXTex/DirectXTexCompress.cpp.i
DirectXTex/DirectXTexCompress.s: DirectXTex/DirectXTexCompress.cpp.s
.PHONY : DirectXTex/DirectXTexCompress.s
# target to generate assembly for a file
DirectXTex/DirectXTexCompress.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/DirectXTex.dir/build.make CMakeFiles/DirectXTex.dir/DirectXTex/DirectXTexCompress.cpp.s
.PHONY : DirectXTex/DirectXTexCompress.cpp.s
DirectXTex/DirectXTexConvert.o: DirectXTex/DirectXTexConvert.cpp.o
.PHONY : DirectXTex/DirectXTexConvert.o
@ -586,168 +574,6 @@ DirectXTex/DirectXTexUtil.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/DirectXTex.dir/build.make CMakeFiles/DirectXTex.dir/DirectXTex/DirectXTexUtil.cpp.s
.PHONY : DirectXTex/DirectXTexUtil.cpp.s
Texassemble/AnimatedGif.o: Texassemble/AnimatedGif.cpp.o
.PHONY : Texassemble/AnimatedGif.o
# target to build an object file
Texassemble/AnimatedGif.cpp.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texassemble.dir/build.make CMakeFiles/texassemble.dir/Texassemble/AnimatedGif.cpp.o
.PHONY : Texassemble/AnimatedGif.cpp.o
Texassemble/AnimatedGif.i: Texassemble/AnimatedGif.cpp.i
.PHONY : Texassemble/AnimatedGif.i
# target to preprocess a source file
Texassemble/AnimatedGif.cpp.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texassemble.dir/build.make CMakeFiles/texassemble.dir/Texassemble/AnimatedGif.cpp.i
.PHONY : Texassemble/AnimatedGif.cpp.i
Texassemble/AnimatedGif.s: Texassemble/AnimatedGif.cpp.s
.PHONY : Texassemble/AnimatedGif.s
# target to generate assembly for a file
Texassemble/AnimatedGif.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texassemble.dir/build.make CMakeFiles/texassemble.dir/Texassemble/AnimatedGif.cpp.s
.PHONY : Texassemble/AnimatedGif.cpp.s
Texassemble/texassemble.o: Texassemble/texassemble.cpp.o
.PHONY : Texassemble/texassemble.o
# target to build an object file
Texassemble/texassemble.cpp.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texassemble.dir/build.make CMakeFiles/texassemble.dir/Texassemble/texassemble.cpp.o
.PHONY : Texassemble/texassemble.cpp.o
Texassemble/texassemble.i: Texassemble/texassemble.cpp.i
.PHONY : Texassemble/texassemble.i
# target to preprocess a source file
Texassemble/texassemble.cpp.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texassemble.dir/build.make CMakeFiles/texassemble.dir/Texassemble/texassemble.cpp.i
.PHONY : Texassemble/texassemble.cpp.i
Texassemble/texassemble.s: Texassemble/texassemble.cpp.s
.PHONY : Texassemble/texassemble.s
# target to generate assembly for a file
Texassemble/texassemble.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texassemble.dir/build.make CMakeFiles/texassemble.dir/Texassemble/texassemble.cpp.s
.PHONY : Texassemble/texassemble.cpp.s
Texconv/ExtendedBMP.o: Texconv/ExtendedBMP.cpp.o
.PHONY : Texconv/ExtendedBMP.o
# target to build an object file
Texconv/ExtendedBMP.cpp.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/Texconv/ExtendedBMP.cpp.o
.PHONY : Texconv/ExtendedBMP.cpp.o
Texconv/ExtendedBMP.i: Texconv/ExtendedBMP.cpp.i
.PHONY : Texconv/ExtendedBMP.i
# target to preprocess a source file
Texconv/ExtendedBMP.cpp.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/Texconv/ExtendedBMP.cpp.i
.PHONY : Texconv/ExtendedBMP.cpp.i
Texconv/ExtendedBMP.s: Texconv/ExtendedBMP.cpp.s
.PHONY : Texconv/ExtendedBMP.s
# target to generate assembly for a file
Texconv/ExtendedBMP.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/Texconv/ExtendedBMP.cpp.s
.PHONY : Texconv/ExtendedBMP.cpp.s
Texconv/PortablePixMap.o: Texconv/PortablePixMap.cpp.o
.PHONY : Texconv/PortablePixMap.o
# target to build an object file
Texconv/PortablePixMap.cpp.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/Texconv/PortablePixMap.cpp.o
.PHONY : Texconv/PortablePixMap.cpp.o
Texconv/PortablePixMap.i: Texconv/PortablePixMap.cpp.i
.PHONY : Texconv/PortablePixMap.i
# target to preprocess a source file
Texconv/PortablePixMap.cpp.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/Texconv/PortablePixMap.cpp.i
.PHONY : Texconv/PortablePixMap.cpp.i
Texconv/PortablePixMap.s: Texconv/PortablePixMap.cpp.s
.PHONY : Texconv/PortablePixMap.s
# target to generate assembly for a file
Texconv/PortablePixMap.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/Texconv/PortablePixMap.cpp.s
.PHONY : Texconv/PortablePixMap.cpp.s
Texconv/texconv.o: Texconv/texconv.cpp.o
.PHONY : Texconv/texconv.o
# target to build an object file
Texconv/texconv.cpp.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/Texconv/texconv.cpp.o
.PHONY : Texconv/texconv.cpp.o
Texconv/texconv.i: Texconv/texconv.cpp.i
.PHONY : Texconv/texconv.i
# target to preprocess a source file
Texconv/texconv.cpp.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/Texconv/texconv.cpp.i
.PHONY : Texconv/texconv.cpp.i
Texconv/texconv.s: Texconv/texconv.cpp.s
.PHONY : Texconv/texconv.s
# target to generate assembly for a file
Texconv/texconv.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texconv.dir/build.make CMakeFiles/texconv.dir/Texconv/texconv.cpp.s
.PHONY : Texconv/texconv.cpp.s
Texdiag/texdiag.o: Texdiag/texdiag.cpp.o
.PHONY : Texdiag/texdiag.o
# target to build an object file
Texdiag/texdiag.cpp.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texdiag.dir/build.make CMakeFiles/texdiag.dir/Texdiag/texdiag.cpp.o
.PHONY : Texdiag/texdiag.cpp.o
Texdiag/texdiag.i: Texdiag/texdiag.cpp.i
.PHONY : Texdiag/texdiag.i
# target to preprocess a source file
Texdiag/texdiag.cpp.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texdiag.dir/build.make CMakeFiles/texdiag.dir/Texdiag/texdiag.cpp.i
.PHONY : Texdiag/texdiag.cpp.i
Texdiag/texdiag.s: Texdiag/texdiag.cpp.s
.PHONY : Texdiag/texdiag.s
# target to generate assembly for a file
Texdiag/texdiag.cpp.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/texdiag.dir/build.make CMakeFiles/texdiag.dir/Texdiag/texdiag.cpp.s
.PHONY : Texdiag/texdiag.cpp.s
# target to build an object file
cmake_pch.hxx.pch:
$(MAKE) $(MAKESILENT) -f CMakeFiles/DirectXTex.dir/build.make CMakeFiles/DirectXTex.dir/cmake_pch.hxx.pch
@ -772,9 +598,6 @@ help:
@echo "... edit_cache"
@echo "... rebuild_cache"
@echo "... DirectXTex"
@echo "... texassemble"
@echo "... texconv"
@echo "... texdiag"
@echo "... DirectXTex/BC.o"
@echo "... DirectXTex/BC.i"
@echo "... DirectXTex/BC.s"
@ -784,6 +607,9 @@ help:
@echo "... DirectXTex/BC6HBC7.o"
@echo "... DirectXTex/BC6HBC7.i"
@echo "... DirectXTex/BC6HBC7.s"
@echo "... DirectXTex/DirectXTexCompress.o"
@echo "... DirectXTex/DirectXTexCompress.i"
@echo "... DirectXTex/DirectXTexCompress.s"
@echo "... DirectXTex/DirectXTexConvert.o"
@echo "... DirectXTex/DirectXTexConvert.i"
@echo "... DirectXTex/DirectXTexConvert.s"
@ -820,24 +646,6 @@ help:
@echo "... DirectXTex/DirectXTexUtil.o"
@echo "... DirectXTex/DirectXTexUtil.i"
@echo "... DirectXTex/DirectXTexUtil.s"
@echo "... Texassemble/AnimatedGif.o"
@echo "... Texassemble/AnimatedGif.i"
@echo "... Texassemble/AnimatedGif.s"
@echo "... Texassemble/texassemble.o"
@echo "... Texassemble/texassemble.i"
@echo "... Texassemble/texassemble.s"
@echo "... Texconv/ExtendedBMP.o"
@echo "... Texconv/ExtendedBMP.i"
@echo "... Texconv/ExtendedBMP.s"
@echo "... Texconv/PortablePixMap.o"
@echo "... Texconv/PortablePixMap.i"
@echo "... Texconv/PortablePixMap.s"
@echo "... Texconv/texconv.o"
@echo "... Texconv/texconv.i"
@echo "... Texconv/texconv.s"
@echo "... Texdiag/texdiag.o"
@echo "... Texdiag/texdiag.i"
@echo "... Texdiag/texdiag.s"
@echo "... cmake_pch.hxx.pch"
@echo "... cmake_pch.hxx.i"
@echo "... cmake_pch.hxx.s"

View File

@ -9,31 +9,10 @@
// http://go.microsoft.com/fwlink/?LinkId=248926
//--------------------------------------------------------------------------------------
#pragma warning(push)
#pragma warning(disable : 4005)
#define WIN32_LEAN_AND_MEAN
#define NOMINMAX
#define NODRAWTEXT
#define NOGDI
#define NOMCX
#define NOSERVICE
#define NOHELP
#pragma warning(pop)
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <fstream>
#include <memory>
#include <list>
#include <vector>
#include <dxgiformat.h>
#pragma warning(disable : 4619 4616 26812)
#include "DirectXTex.h"
#include "DirectXTexP.h"
//Uncomment to add support for OpenEXR (.exr)
//#define USE_OPENEXR

Binary file not shown.

BIN
bin/CMake/libDirectXTex.id0 Normal file

Binary file not shown.

BIN
bin/CMake/libDirectXTex.id1 Normal file

Binary file not shown.

BIN
bin/CMake/libDirectXTex.id2 Normal file

Binary file not shown.

BIN
bin/CMake/libDirectXTex.nam Normal file

Binary file not shown.

BIN
bin/CMake/libDirectXTex.so Normal file

Binary file not shown.

BIN
bin/CMake/libDirectXTex.til Normal file

Binary file not shown.