From 4219dc76987c4013ed2c7c646bf38a656efdcfdd Mon Sep 17 00:00:00 2001 From: myT <> Date: Wed, 20 Sep 2023 17:30:48 +0200 Subject: [PATCH] removed 32-bit builds, disabled Linux/FreeBSD clients --- Makefile | 36 +- makefiles/bsd_gmake/botlib.make | 12 +- makefiles/bsd_gmake/cnq3-server.make | 28 +- makefiles/linux_gmake/botlib.make | 12 +- makefiles/linux_gmake/cnq3-server.make | 28 +- makefiles/premake5.lua | 97 +-- makefiles/windows_vs2019/botlib.vcxproj | 108 +--- makefiles/windows_vs2019/cnq3-server.vcxproj | 136 +--- .../windows_vs2019/cnq3-server.vcxproj.user | 16 +- makefiles/windows_vs2019/cnq3.sln | 26 - makefiles/windows_vs2019/cnq3.vcxproj | 138 +--- makefiles/windows_vs2019/cnq3.vcxproj.user | 16 +- .../windows_vs2019/libjpeg-turbo.vcxproj | 585 +++-------------- .../libjpeg-turbo.vcxproj.filters | 105 ---- makefiles/windows_vs2019/renderer.vcxproj | 110 +--- makefiles/windows_vs2019/shadercomp.vcxproj | 116 +--- makefiles/windows_vs2022/botlib.vcxproj | 110 +--- makefiles/windows_vs2022/cnq3-server.vcxproj | 138 +--- .../windows_vs2022/cnq3-server.vcxproj.user | 16 +- makefiles/windows_vs2022/cnq3.sln | 26 - makefiles/windows_vs2022/cnq3.vcxproj | 140 +---- makefiles/windows_vs2022/cnq3.vcxproj.user | 16 +- .../windows_vs2022/libjpeg-turbo.vcxproj | 587 +++--------------- .../libjpeg-turbo.vcxproj.filters | 105 ---- makefiles/windows_vs2022/renderer.vcxproj | 112 +--- makefiles/windows_vs2022/shadercomp.vcxproj | 118 +--- 26 files changed, 314 insertions(+), 2623 deletions(-) diff --git a/Makefile b/Makefile index 075835b..310c974 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,11 @@ ifndef verbose SILENT = @ endif -PROJECTS := server client +# if client +#PROJECTS := server client +# else +PROJECTS := server +# endif help: @echo "Usage: $(make_name) [config=name] target" @@ -28,13 +32,19 @@ help: @echo "" @echo "TARGETS:" @echo " server" - @echo " client" - @echo " all (server + client)" +# if client +# @echo " client" +# @echo " all (server + client)" +# else + @echo " all (server only for now)" +# end @echo " clean" @echo " help (default)" - @echo "" - @echo "REQUIREMENTS:" - @echo " NASM is required for building the client." +# if client +# @echo "" +# @echo "REQUIREMENTS:" +# @echo " NASM is required for building the client." +# endif @echo "" @echo "OPTIONS:" @echo " If the environment variable QUAKE3DIR is defined," @@ -43,11 +53,17 @@ help: server: @${MAKE} --no-print-directory -C $(make_dir) cnq3-server config=$(config)_x64 - -client: - @${MAKE} --no-print-directory -C $(make_dir) cnq3 config=$(config)_x64 + +# if client +#client: +# @${MAKE} --no-print-directory -C $(make_dir) cnq3 config=$(config)_x64 +# endif clean: @${MAKE} --no-print-directory -C $(make_dir) clean config=$(config)_x64 -all: server client +# if client +#all: server client +# else +all: server +# endif diff --git a/makefiles/bsd_gmake/botlib.make b/makefiles/bsd_gmake/botlib.make index 1c1efeb..e77b49d 100644 --- a/makefiles/bsd_gmake/botlib.make +++ b/makefiles/bsd_gmake/botlib.make @@ -12,9 +12,9 @@ endif ifeq ($(config),debug_x64) RESCOMP = windres - TARGETDIR = ../../.build/debug_x64 + TARGETDIR = ../../.build/debug TARGET = $(TARGETDIR)/libbotlib.a - OBJDIR = ../../.build/debug_x64/botlib + OBJDIR = ../../.build/debug/botlib DEFINES += -DBOTLIB -DDEBUG -D_DEBUG INCLUDES += FORCE_INCLUDE += @@ -24,7 +24,7 @@ ifeq ($(config),debug_x64) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -L../../.build/debug_x64 -L/usr/lib64 -m64 + ALL_LDFLAGS += $(LDFLAGS) -L../../.build/debug -L/usr/lib64 -m64 LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -39,9 +39,9 @@ endif ifeq ($(config),release_x64) RESCOMP = windres - TARGETDIR = ../../.build/release_x64 + TARGETDIR = ../../.build/release TARGET = $(TARGETDIR)/libbotlib.a - OBJDIR = ../../.build/release_x64/botlib + OBJDIR = ../../.build/release/botlib DEFINES += -DBOTLIB -DNDEBUG INCLUDES += FORCE_INCLUDE += @@ -51,7 +51,7 @@ ifeq ($(config),release_x64) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -L../../.build/release_x64 -L/usr/lib64 -m64 + ALL_LDFLAGS += $(LDFLAGS) -L../../.build/release -L/usr/lib64 -m64 LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef diff --git a/makefiles/bsd_gmake/cnq3-server.make b/makefiles/bsd_gmake/cnq3-server.make index 04c4151..1ceb18f 100644 --- a/makefiles/bsd_gmake/cnq3-server.make +++ b/makefiles/bsd_gmake/cnq3-server.make @@ -12,9 +12,9 @@ endif ifeq ($(config),debug_x64) RESCOMP = windres - TARGETDIR = ../../.bin/debug_x64 - TARGET = $(TARGETDIR)/cnq3-server-x64 - OBJDIR = ../../.build/debug_x64/cnq3-server + TARGETDIR = ../../.bin/debug + TARGET = $(TARGETDIR)/cnq3-server + OBJDIR = ../../.build/debug/cnq3-server DEFINES += -DDEDICATED -DDEBUG -D_DEBUG INCLUDES += FORCE_INCLUDE += @@ -22,9 +22,9 @@ ifeq ($(config),debug_x64) ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -x c++ -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions -fno-rtti -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -x c++ -std=c++98 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += ../../.build/debug_x64/libbotlib.a -ldl -lm -lexecinfo - LDDEPS += ../../.build/debug_x64/libbotlib.a - ALL_LDFLAGS += $(LDFLAGS) -L../../.build/debug_x64 -L/usr/lib64 -m64 + LIBS += ../../.build/debug/libbotlib.a -ldl -lm -lexecinfo + LDDEPS += ../../.build/debug/libbotlib.a + ALL_LDFLAGS += $(LDFLAGS) -L../../.build/debug -L/usr/lib64 -m64 LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS @echo Running prebuild commands @@ -34,7 +34,7 @@ ifeq ($(config),debug_x64) endef define POSTBUILDCMDS @echo Running postbuild commands - if [ -n "$$QUAKE3DIR" ]; then cp "../../.bin/debug_x64/cnq3-server-x64" "$(QUAKE3DIR)"; fi + if [ -n "$$QUAKE3DIR" ]; then cp "../../.bin/debug/cnq3-server" "$(QUAKE3DIR)"; fi endef all: prebuild prelink $(TARGET) @: @@ -43,9 +43,9 @@ endif ifeq ($(config),release_x64) RESCOMP = windres - TARGETDIR = ../../.bin/release_x64 - TARGET = $(TARGETDIR)/cnq3-server-x64 - OBJDIR = ../../.build/release_x64/cnq3-server + TARGETDIR = ../../.bin/release + TARGET = $(TARGETDIR)/cnq3-server + OBJDIR = ../../.build/release/cnq3-server DEFINES += -DDEDICATED -DNDEBUG INCLUDES += FORCE_INCLUDE += @@ -53,9 +53,9 @@ ifeq ($(config),release_x64) ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -ffast-math -fomit-frame-pointer -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 -x c++ -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -ffast-math -fomit-frame-pointer -Os -g -msse2 -fno-exceptions -fno-rtti -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 -x c++ -std=c++98 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += ../../.build/release_x64/libbotlib.a -ldl -lm -lexecinfo - LDDEPS += ../../.build/release_x64/libbotlib.a - ALL_LDFLAGS += $(LDFLAGS) -L../../.build/release_x64 -L/usr/lib64 -m64 + LIBS += ../../.build/release/libbotlib.a -ldl -lm -lexecinfo + LDDEPS += ../../.build/release/libbotlib.a + ALL_LDFLAGS += $(LDFLAGS) -L../../.build/release -L/usr/lib64 -m64 LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS @echo Running prebuild commands @@ -65,7 +65,7 @@ ifeq ($(config),release_x64) endef define POSTBUILDCMDS @echo Running postbuild commands - if [ -n "$$QUAKE3DIR" ]; then cp "../../.bin/release_x64/cnq3-server-x64" "$(QUAKE3DIR)"; fi + if [ -n "$$QUAKE3DIR" ]; then cp "../../.bin/release/cnq3-server" "$(QUAKE3DIR)"; fi endef all: prebuild prelink $(TARGET) @: diff --git a/makefiles/linux_gmake/botlib.make b/makefiles/linux_gmake/botlib.make index 1c1efeb..e77b49d 100644 --- a/makefiles/linux_gmake/botlib.make +++ b/makefiles/linux_gmake/botlib.make @@ -12,9 +12,9 @@ endif ifeq ($(config),debug_x64) RESCOMP = windres - TARGETDIR = ../../.build/debug_x64 + TARGETDIR = ../../.build/debug TARGET = $(TARGETDIR)/libbotlib.a - OBJDIR = ../../.build/debug_x64/botlib + OBJDIR = ../../.build/debug/botlib DEFINES += -DBOTLIB -DDEBUG -D_DEBUG INCLUDES += FORCE_INCLUDE += @@ -24,7 +24,7 @@ ifeq ($(config),debug_x64) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -L../../.build/debug_x64 -L/usr/lib64 -m64 + ALL_LDFLAGS += $(LDFLAGS) -L../../.build/debug -L/usr/lib64 -m64 LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef @@ -39,9 +39,9 @@ endif ifeq ($(config),release_x64) RESCOMP = windres - TARGETDIR = ../../.build/release_x64 + TARGETDIR = ../../.build/release TARGET = $(TARGETDIR)/libbotlib.a - OBJDIR = ../../.build/release_x64/botlib + OBJDIR = ../../.build/release/botlib DEFINES += -DBOTLIB -DNDEBUG INCLUDES += FORCE_INCLUDE += @@ -51,7 +51,7 @@ ifeq ($(config),release_x64) ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) LIBS += LDDEPS += - ALL_LDFLAGS += $(LDFLAGS) -L../../.build/release_x64 -L/usr/lib64 -m64 + ALL_LDFLAGS += $(LDFLAGS) -L../../.build/release -L/usr/lib64 -m64 LINKCMD = $(AR) -rcs "$@" $(OBJECTS) define PREBUILDCMDS endef diff --git a/makefiles/linux_gmake/cnq3-server.make b/makefiles/linux_gmake/cnq3-server.make index 4636c1b..030f5d9 100644 --- a/makefiles/linux_gmake/cnq3-server.make +++ b/makefiles/linux_gmake/cnq3-server.make @@ -12,9 +12,9 @@ endif ifeq ($(config),debug_x64) RESCOMP = windres - TARGETDIR = ../../.bin/debug_x64 - TARGET = $(TARGETDIR)/cnq3-server-x64 - OBJDIR = ../../.build/debug_x64/cnq3-server + TARGETDIR = ../../.bin/debug + TARGET = $(TARGETDIR)/cnq3-server + OBJDIR = ../../.build/debug/cnq3-server DEFINES += -DDEDICATED -DDEBUG -D_DEBUG INCLUDES += FORCE_INCLUDE += @@ -22,9 +22,9 @@ ifeq ($(config),debug_x64) ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -x c++ -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -fno-exceptions -fno-rtti -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -x c++ -std=c++98 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += ../../.build/debug_x64/libbotlib.a -ldl -lm - LDDEPS += ../../.build/debug_x64/libbotlib.a - ALL_LDFLAGS += $(LDFLAGS) -L../../.build/debug_x64 -L/usr/lib64 -m64 + LIBS += ../../.build/debug/libbotlib.a -ldl -lm + LDDEPS += ../../.build/debug/libbotlib.a + ALL_LDFLAGS += $(LDFLAGS) -L../../.build/debug -L/usr/lib64 -m64 LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS @echo Running prebuild commands @@ -34,7 +34,7 @@ ifeq ($(config),debug_x64) endef define POSTBUILDCMDS @echo Running postbuild commands - if [ -n "$$QUAKE3DIR" ]; then cp "../../.bin/debug_x64/cnq3-server-x64" "$(QUAKE3DIR)"; fi + if [ -n "$$QUAKE3DIR" ]; then cp "../../.bin/debug/cnq3-server" "$(QUAKE3DIR)"; fi endef all: prebuild prelink $(TARGET) @: @@ -43,9 +43,9 @@ endif ifeq ($(config),release_x64) RESCOMP = windres - TARGETDIR = ../../.bin/release_x64 - TARGET = $(TARGETDIR)/cnq3-server-x64 - OBJDIR = ../../.build/release_x64/cnq3-server + TARGETDIR = ../../.bin/release + TARGET = $(TARGETDIR)/cnq3-server + OBJDIR = ../../.build/release/cnq3-server DEFINES += -DDEDICATED -DNDEBUG INCLUDES += FORCE_INCLUDE += @@ -53,9 +53,9 @@ ifeq ($(config),release_x64) ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -ffast-math -fomit-frame-pointer -Os -g -msse2 -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 -x c++ -std=c++98 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -ffast-math -fomit-frame-pointer -Os -g -msse2 -fno-exceptions -fno-rtti -Wno-unused-parameter -Wno-write-strings -Wno-parentheses -Wno-parentheses-equality -g1 -x c++ -std=c++98 ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES) - LIBS += ../../.build/release_x64/libbotlib.a -ldl -lm - LDDEPS += ../../.build/release_x64/libbotlib.a - ALL_LDFLAGS += $(LDFLAGS) -L../../.build/release_x64 -L/usr/lib64 -m64 + LIBS += ../../.build/release/libbotlib.a -ldl -lm + LDDEPS += ../../.build/release/libbotlib.a + ALL_LDFLAGS += $(LDFLAGS) -L../../.build/release -L/usr/lib64 -m64 LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS) define PREBUILDCMDS @echo Running prebuild commands @@ -65,7 +65,7 @@ ifeq ($(config),release_x64) endef define POSTBUILDCMDS @echo Running postbuild commands - if [ -n "$$QUAKE3DIR" ]; then cp "../../.bin/release_x64/cnq3-server-x64" "$(QUAKE3DIR)"; fi + if [ -n "$$QUAKE3DIR" ]; then cp "../../.bin/release/cnq3-server" "$(QUAKE3DIR)"; fi endef all: prebuild prelink $(TARGET) @: diff --git a/makefiles/premake5.lua b/makefiles/premake5.lua index f7b6d35..6416604 100644 --- a/makefiles/premake5.lua +++ b/makefiles/premake5.lua @@ -4,7 +4,7 @@ Currently used build: premake v5.0.0-beta2 There are 3 supported build toolchains: -- Visual C++ on Windows x64 and x86 +- Visual C++ on Windows x64 - GCC or Clang on Linux x64 - Clang or GCC on FreeBSD x64 @@ -33,9 +33,15 @@ abs_path_q3 = string.format("$(%s)", envvar_q3dir) extra_warnings = 1 +-- premake tokens for this script: +-- cfg.buildcfg -> "debug", "release" +-- cfg.architecture -> "x86_64" ("x86" deprecated) +-- cfg.system -> "windows", "linux", "bsd" +-- cfg.platform -> "x64" ("x32" deprecated) + local function GetBinDirName() - return "%{cfg.buildcfg}_%{cfg.platform}" + return "%{cfg.buildcfg}" end @@ -112,25 +118,16 @@ local function GetMakePath(premakePath) end --- premake tokens for this script: --- cfg.buildcfg -> "debug", "release" --- cfg.architecture -> "x86", "x86_64" --- cfg.system -> "windows", "linux", "bsd" --- cfg.platform -> "x32", "x64" - local function GetLibJpegTurboNasmFlags() libjpeg_turbo_nasm_flags_map = { - windows_x32 = "-fwin32 -DWIN32", - windows_x64 = "-fwin64 -DWIN64 -D__x86_64__", - linux_x32 = "-felf32 -DELF", - linux_x64 = "-felf64 -DELF -D__x86_64__", - bsd_x32 = "-felf32 -DELF", - bsd_x64 = "-felf64 -DELF -D__x86_64__" + windows = "-fwin64 -DWIN64 -D__x86_64__", + linux = "-felf64 -DELF -D__x86_64__", + bsd = "-felf64 -DELF -D__x86_64__" } - return "%{libjpeg_turbo_nasm_flags_map[cfg.system..\"_\"..cfg.platform]}" + return "%{libjpeg_turbo_nasm_flags_map[cfg.system]}" end @@ -144,18 +141,6 @@ local function GetCompilerObjectExtension() end -local function GetExeNameSuffix() - - platform_exe_name_suffix_map = - { - x32 = "-x86", - x64 = "-x64" - } - - return "%{platform_exe_name_suffix_map[cfg.platform]}" - -end - local function ApplyProjectSettings(outputExe) -- @@ -234,9 +219,6 @@ local function ApplyProjectSettings(outputExe) buildoptions { "/GL" } linkoptions { "" } - filter { "action:vs*", "platforms:x32" } - buildoptions { "/arch:SSE2" } - -- disable the "conversion from 'X' to 'Y', possible loss of data" warning -- this should be removed once the x64 port is complete filter { "action:vs*", "platforms:x64" } @@ -268,9 +250,6 @@ local function ApplyProjectSettings(outputExe) buildoptions { "-g1" } linkoptions { "" } - filter { "action:gmake", "platforms:x32" } - buildoptions { "-mmmx -msse -msse2" } - filter { } end @@ -287,7 +266,6 @@ local function ApplyExeProjectSettings(exeName, server) filter { } - exeName = exeName..GetExeNameSuffix() targetname(exeName) local server_sources = @@ -570,44 +548,6 @@ local function ApplyLibJpegTurboProjectSettings() "jmemmgr.c" } - local jpeg_asm_sources_x86 = - { - "jsimdcpu", - "jfdctflt-3dn", - "jidctflt-3dn", - "jquant-3dn", - "jccolor-mmx", - "jcgray-mmx", - "jcsample-mmx", - "jdcolor-mmx", - "jdmerge-mmx", - "jdsample-mmx", - "jfdctfst-mmx", - "jfdctint-mmx", - "jidctfst-mmx", - "jidctint-mmx", - "jidctred-mmx", - "jquant-mmx", - "jfdctflt-sse", - "jidctflt-sse", - "jquant-sse", - "jccolor-sse2", - "jcgray-sse2", - "jchuff-sse2", - "jcsample-sse2", - "jdcolor-sse2", - "jdmerge-sse2", - "jdsample-sse2", - "jfdctfst-sse2", - "jfdctint-sse2", - "jidctflt-sse2", - "jidctfst-sse2", - "jidctint-sse2", - "jidctred-sse2", - "jquantf-sse2", - "jquanti-sse2" - } - local jpeg_asm_sources_x64 = { "jfdctflt-sse-64", @@ -632,11 +572,6 @@ local function ApplyLibJpegTurboProjectSettings() includedirs { path_src.."/libjpeg-turbo", path_src.."/libjpeg-turbo/simd" } defines { "WITH_SIMD" } - filter "platforms:x32" - AddAssemblerSourcesFromArray("libjpeg-turbo/simd", jpeg_asm_sources_x86) - files { path_src.."/libjpeg-turbo/simd/jsimd_i386.c" } - defines { "SIZEOF_SIZE_T=4" } - filter "platforms:x64" AddAssemblerSourcesFromArray("libjpeg-turbo/simd", jpeg_asm_sources_x64) files { path_src.."/libjpeg-turbo/simd/jsimd_x86_64.c" } @@ -674,11 +609,7 @@ end solution "cnq3" - if os.istarget("windows") then - platforms { "x64", "x32" } - else - platforms { "x64" } - end + platforms { "x64" } location ( string.format("%s/%s_%s", path_make, os.target(), _ACTION) ) configurations { "debug", "release" } @@ -714,7 +645,7 @@ solution "cnq3" postbuildcommands { string.format("\"%s/renderer/hlsl/%%{cfg.buildtarget.name}\"", make_path_src) } ApplyProjectSettings(true) --[[ - -- VC++ STILL requires absolute paths for these... maybe it will be fixed a few decades after I'm in the grave + VC++ STILL requires absolute paths for these... maybe it will be fixed a few decades after I'm in the grave local debug_path_dir = string.format("%s/renderer/hlsl", make_path_src) local debug_path_exe = string.format("%s/%%{cfg.buildtarget.name}", debug_path_dir) debugdir(debug_path_dir) diff --git a/makefiles/windows_vs2019/botlib.vcxproj b/makefiles/windows_vs2019/botlib.vcxproj index fd2c81c..b568f3f 100644 --- a/makefiles/windows_vs2019/botlib.vcxproj +++ b/makefiles/windows_vs2019/botlib.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {A1A792F4-8D49-BDCA-7604-D11E6245441B} @@ -31,12 +23,6 @@ Unicode v142 - - StaticLibrary - true - Unicode - v142 - StaticLibrary false @@ -44,53 +30,26 @@ v142 true - - StaticLibrary - false - Unicode - v142 - true - - - - - - - - ..\..\.build\debug_x64\ - ..\..\.build\debug_x64\botlib\ - botlib - .lib - false - - - ..\..\.build\debug_x32\ - ..\..\.build\debug_x32\botlib\ + ..\..\.build\debug\ + ..\..\.build\debug\botlib\ botlib .lib false - ..\..\.build\release_x64\ - ..\..\.build\release_x64\botlib\ - botlib - .lib - false - - - ..\..\.build\release_x32\ - ..\..\.build\release_x32\botlib\ + ..\..\.build\release\ + ..\..\.build\release\botlib\ botlib .lib false @@ -113,29 +72,7 @@ true - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level4 - BOTLIB;DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - - - Windows - true - - - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -167,40 +104,7 @@ true - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level4 - Default - BOTLIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - - - Windows - true - true - true - - - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) %(AdditionalOptions) diff --git a/makefiles/windows_vs2019/cnq3-server.vcxproj b/makefiles/windows_vs2019/cnq3-server.vcxproj index b48ae8b..7588d01 100644 --- a/makefiles/windows_vs2019/cnq3-server.vcxproj +++ b/makefiles/windows_vs2019/cnq3-server.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B} @@ -31,12 +23,6 @@ Unicode v142 - - Application - true - Unicode - v142 - Application false @@ -44,58 +30,29 @@ v142 true - - Application - false - Unicode - v142 - true - - - - - - - true - ..\..\.bin\debug_x64\ - ..\..\.build\debug_x64\cnq3-server\ - cnq3-server-x64 - .exe - false - - - true - ..\..\.bin\debug_x32\ - ..\..\.build\debug_x32\cnq3-server\ - cnq3-server-x86 + ..\..\.bin\debug\ + ..\..\.build\debug\cnq3-server\ + cnq3-server .exe false false - ..\..\.bin\release_x64\ - ..\..\.build\release_x64\cnq3-server\ - cnq3-server-x64 - .exe - false - - - false - ..\..\.bin\release_x32\ - ..\..\.build\release_x32\cnq3-server\ - cnq3-server-x86 + ..\..\.bin\release\ + ..\..\.build\release\cnq3-server\ + cnq3-server .exe false @@ -116,7 +73,7 @@ Windows true Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies) - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) WinMainCRTStartup ..\..\code\win32\winquake.res /STACK:8388608 %(AdditionalOptions) @@ -124,37 +81,8 @@ "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - copy "..\..\.bin\debug_x64\cnq3-server-x64.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\debug_x64\cnq3-server-x64.pdb" "$(QUAKE3DIR)" - - - - - NotUsing - Level4 - DEDICATED;DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - - - Windows - true - Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies) - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) - WinMainCRTStartup - ..\..\code\win32\winquake.res /STACK:8388608 %(AdditionalOptions) - - - "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - - - copy "..\..\.bin\debug_x32\cnq3-server-x86.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\debug_x32\cnq3-server-x86.pdb" "$(QUAKE3DIR)" + copy "..\..\.bin\debug\cnq3-server.exe" "$(QUAKE3DIR)" +copy "..\..\.bin\debug\cnq3-server.pdb" "$(QUAKE3DIR)" @@ -184,7 +112,7 @@ copy "..\..\.bin\debug_x32\cnq3-server-x86.pdb" "$(QUAKE3DIR)" true true Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies) - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) WinMainCRTStartup ..\..\code\win32\winquake.res /STACK:8388608 /OPT:REF /OPT:ICF %(AdditionalOptions) @@ -192,48 +120,8 @@ copy "..\..\.bin\debug_x32\cnq3-server-x86.pdb" "$(QUAKE3DIR)" "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - copy "..\..\.bin\release_x64\cnq3-server-x64.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\release_x64\cnq3-server-x64.pdb" "$(QUAKE3DIR)" - - - - - NotUsing - Level4 - Default - DEDICATED;NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - - - Windows - true - true - true - Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies) - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) - WinMainCRTStartup - ..\..\code\win32\winquake.res /STACK:8388608 /OPT:REF /OPT:ICF %(AdditionalOptions) - - - "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - - - copy "..\..\.bin\release_x32\cnq3-server-x86.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\release_x32\cnq3-server-x86.pdb" "$(QUAKE3DIR)" + copy "..\..\.bin\release\cnq3-server.exe" "$(QUAKE3DIR)" +copy "..\..\.bin\release\cnq3-server.pdb" "$(QUAKE3DIR)" diff --git a/makefiles/windows_vs2019/cnq3-server.vcxproj.user b/makefiles/windows_vs2019/cnq3-server.vcxproj.user index 74d2a65..e452838 100644 --- a/makefiles/windows_vs2019/cnq3-server.vcxproj.user +++ b/makefiles/windows_vs2019/cnq3-server.vcxproj.user @@ -1,25 +1,13 @@ - $(QUAKE3DIR)\cnq3-server-x64.exe - $(QUAKE3DIR) - WindowsLocalDebugger - +set fs_game $(CPMADIR) +set sv_pure 0 - - - $(QUAKE3DIR)\cnq3-server-x86.exe + $(QUAKE3DIR)\cnq3-server.exe $(QUAKE3DIR) WindowsLocalDebugger +set fs_game $(CPMADIR) +set sv_pure 0 - $(QUAKE3DIR)\cnq3-server-x64.exe - $(QUAKE3DIR) - WindowsLocalDebugger - +set fs_game $(CPMADIR) +set sv_pure 0 - - - $(QUAKE3DIR)\cnq3-server-x86.exe + $(QUAKE3DIR)\cnq3-server.exe $(QUAKE3DIR) WindowsLocalDebugger +set fs_game $(CPMADIR) +set sv_pure 0 diff --git a/makefiles/windows_vs2019/cnq3.sln b/makefiles/windows_vs2019/cnq3.sln index 3ce2fa3..6138f8b 100644 --- a/makefiles/windows_vs2019/cnq3.sln +++ b/makefiles/windows_vs2019/cnq3.sln @@ -18,58 +18,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shadercomp", "shadercomp.vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug|Win32 = debug|Win32 debug|x64 = debug|x64 - release|Win32 = release|Win32 release|x64 = release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A1A792F4-8D49-BDCA-7604-D11E6245441B}.debug|Win32.ActiveCfg = debug|Win32 - {A1A792F4-8D49-BDCA-7604-D11E6245441B}.debug|Win32.Build.0 = debug|Win32 {A1A792F4-8D49-BDCA-7604-D11E6245441B}.debug|x64.ActiveCfg = debug|x64 {A1A792F4-8D49-BDCA-7604-D11E6245441B}.debug|x64.Build.0 = debug|x64 - {A1A792F4-8D49-BDCA-7604-D11E6245441B}.release|Win32.ActiveCfg = release|Win32 - {A1A792F4-8D49-BDCA-7604-D11E6245441B}.release|Win32.Build.0 = release|Win32 {A1A792F4-8D49-BDCA-7604-D11E6245441B}.release|x64.ActiveCfg = release|x64 {A1A792F4-8D49-BDCA-7604-D11E6245441B}.release|x64.Build.0 = release|x64 - {BA3B957C-A672-960D-4F5F-7C103B75120F}.debug|Win32.ActiveCfg = debug|Win32 - {BA3B957C-A672-960D-4F5F-7C103B75120F}.debug|Win32.Build.0 = debug|Win32 {BA3B957C-A672-960D-4F5F-7C103B75120F}.debug|x64.ActiveCfg = debug|x64 {BA3B957C-A672-960D-4F5F-7C103B75120F}.debug|x64.Build.0 = debug|x64 - {BA3B957C-A672-960D-4F5F-7C103B75120F}.release|Win32.ActiveCfg = release|Win32 - {BA3B957C-A672-960D-4F5F-7C103B75120F}.release|Win32.Build.0 = release|Win32 {BA3B957C-A672-960D-4F5F-7C103B75120F}.release|x64.ActiveCfg = release|x64 {BA3B957C-A672-960D-4F5F-7C103B75120F}.release|x64.Build.0 = release|x64 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.debug|Win32.ActiveCfg = debug|Win32 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.debug|Win32.Build.0 = debug|Win32 {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.debug|x64.ActiveCfg = debug|x64 {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.debug|x64.Build.0 = debug|x64 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.release|Win32.ActiveCfg = release|Win32 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.release|Win32.Build.0 = release|Win32 {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.release|x64.ActiveCfg = release|x64 {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.release|x64.Build.0 = release|x64 - {DB56484D-4717-C483-1052-0D017CD10860}.debug|Win32.ActiveCfg = debug|Win32 - {DB56484D-4717-C483-1052-0D017CD10860}.debug|Win32.Build.0 = debug|Win32 {DB56484D-4717-C483-1052-0D017CD10860}.debug|x64.ActiveCfg = debug|x64 {DB56484D-4717-C483-1052-0D017CD10860}.debug|x64.Build.0 = debug|x64 - {DB56484D-4717-C483-1052-0D017CD10860}.release|Win32.ActiveCfg = release|Win32 - {DB56484D-4717-C483-1052-0D017CD10860}.release|Win32.Build.0 = release|Win32 {DB56484D-4717-C483-1052-0D017CD10860}.release|x64.ActiveCfg = release|x64 {DB56484D-4717-C483-1052-0D017CD10860}.release|x64.Build.0 = release|x64 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.debug|Win32.ActiveCfg = debug|Win32 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.debug|Win32.Build.0 = debug|Win32 {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.debug|x64.ActiveCfg = debug|x64 {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.debug|x64.Build.0 = debug|x64 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.release|Win32.ActiveCfg = release|Win32 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.release|Win32.Build.0 = release|Win32 {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.release|x64.ActiveCfg = release|x64 {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.release|x64.Build.0 = release|x64 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.debug|Win32.ActiveCfg = debug|Win32 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.debug|Win32.Build.0 = debug|Win32 {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.debug|x64.ActiveCfg = debug|x64 {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.debug|x64.Build.0 = debug|x64 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.release|Win32.ActiveCfg = release|Win32 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.release|Win32.Build.0 = release|Win32 {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.release|x64.ActiveCfg = release|x64 {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.release|x64.Build.0 = release|x64 EndGlobalSection diff --git a/makefiles/windows_vs2019/cnq3.vcxproj b/makefiles/windows_vs2019/cnq3.vcxproj index df46305..0cdcdf9 100644 --- a/makefiles/windows_vs2019/cnq3.vcxproj +++ b/makefiles/windows_vs2019/cnq3.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {BA3B957C-A672-960D-4F5F-7C103B75120F} @@ -31,12 +23,6 @@ Unicode v142 - - Application - true - Unicode - v142 - Application false @@ -44,58 +30,29 @@ v142 true - - Application - false - Unicode - v142 - true - - - - - - - true - ..\..\.bin\debug_x64\ - ..\..\.build\debug_x64\cnq3\ - cnq3-x64 - .exe - false - - - true - ..\..\.bin\debug_x32\ - ..\..\.build\debug_x32\cnq3\ - cnq3-x86 + ..\..\.bin\debug\ + ..\..\.build\debug\cnq3\ + cnq3 .exe false false - ..\..\.bin\release_x64\ - ..\..\.build\release_x64\cnq3\ - cnq3-x64 - .exe - false - - - false - ..\..\.bin\release_x32\ - ..\..\.build\release_x32\cnq3\ - cnq3-x86 + ..\..\.bin\release\ + ..\..\.build\release\cnq3\ + cnq3 .exe false @@ -117,7 +74,7 @@ Windows true Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;D3D12.lib;DXGI.lib;Dwmapi.lib;nvapi64.lib;%(AdditionalDependencies) - ..\..\code\nvapi;..\..\.build\debug_x64;%(AdditionalLibraryDirectories) + ..\..\code\nvapi;..\..\.build\debug;%(AdditionalLibraryDirectories) WinMainCRTStartup ..\..\code\win32\winquake.res /STACK:8388608 /MANIFEST:EMBED /MANIFESTINPUT:..\..\code\win32\client.manifest %(AdditionalOptions) @@ -125,38 +82,8 @@ "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - copy "..\..\.bin\debug_x64\cnq3-x64.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\debug_x64\cnq3-x64.pdb" "$(QUAKE3DIR)" - - - - - NotUsing - Level4 - DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\imgui;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - - - Windows - true - Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;D3D12.lib;DXGI.lib;Dwmapi.lib;nvapi64.lib;%(AdditionalDependencies) - ..\..\code\nvapi;..\..\.build\debug_x32;%(AdditionalLibraryDirectories) - WinMainCRTStartup - ..\..\code\win32\winquake.res /STACK:8388608 /MANIFEST:EMBED /MANIFESTINPUT:..\..\code\win32\client.manifest %(AdditionalOptions) - - - "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - - - copy "..\..\.bin\debug_x32\cnq3-x86.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\debug_x32\cnq3-x86.pdb" "$(QUAKE3DIR)" + copy "..\..\.bin\debug\cnq3.exe" "$(QUAKE3DIR)" +copy "..\..\.bin\debug\cnq3.pdb" "$(QUAKE3DIR)" @@ -187,7 +114,7 @@ copy "..\..\.bin\debug_x32\cnq3-x86.pdb" "$(QUAKE3DIR)" true true Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;D3D12.lib;DXGI.lib;Dwmapi.lib;nvapi64.lib;%(AdditionalDependencies) - ..\..\code\nvapi;..\..\.build\release_x64;%(AdditionalLibraryDirectories) + ..\..\code\nvapi;..\..\.build\release;%(AdditionalLibraryDirectories) WinMainCRTStartup ..\..\code\win32\winquake.res /STACK:8388608 /MANIFEST:EMBED /MANIFESTINPUT:..\..\code\win32\client.manifest /OPT:REF /OPT:ICF %(AdditionalOptions) @@ -195,49 +122,8 @@ copy "..\..\.bin\debug_x32\cnq3-x86.pdb" "$(QUAKE3DIR)" "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - copy "..\..\.bin\release_x64\cnq3-x64.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\release_x64\cnq3-x64.pdb" "$(QUAKE3DIR)" - - - - - NotUsing - Level4 - Default - NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\imgui;%(AdditionalIncludeDirectories) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - - - Windows - true - true - true - Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;D3D12.lib;DXGI.lib;Dwmapi.lib;nvapi64.lib;%(AdditionalDependencies) - ..\..\code\nvapi;..\..\.build\release_x32;%(AdditionalLibraryDirectories) - WinMainCRTStartup - ..\..\code\win32\winquake.res /STACK:8388608 /MANIFEST:EMBED /MANIFESTINPUT:..\..\code\win32\client.manifest /OPT:REF /OPT:ICF %(AdditionalOptions) - - - "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - - - copy "..\..\.bin\release_x32\cnq3-x86.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\release_x32\cnq3-x86.pdb" "$(QUAKE3DIR)" + copy "..\..\.bin\release\cnq3.exe" "$(QUAKE3DIR)" +copy "..\..\.bin\release\cnq3.pdb" "$(QUAKE3DIR)" diff --git a/makefiles/windows_vs2019/cnq3.vcxproj.user b/makefiles/windows_vs2019/cnq3.vcxproj.user index 7b083f0..dd3c3f8 100644 --- a/makefiles/windows_vs2019/cnq3.vcxproj.user +++ b/makefiles/windows_vs2019/cnq3.vcxproj.user @@ -1,25 +1,13 @@ - $(QUAKE3DIR)\cnq3-x64.exe - $(QUAKE3DIR) - WindowsLocalDebugger - +set fs_game $(CPMADIR) +set sv_pure 0 +set r_fullscreen 0 - - - $(QUAKE3DIR)\cnq3-x86.exe + $(QUAKE3DIR)\cnq3.exe $(QUAKE3DIR) WindowsLocalDebugger +set fs_game $(CPMADIR) +set sv_pure 0 +set r_fullscreen 0 - $(QUAKE3DIR)\cnq3-x64.exe - $(QUAKE3DIR) - WindowsLocalDebugger - +set fs_game $(CPMADIR) +set sv_pure 0 +set r_fullscreen 0 - - - $(QUAKE3DIR)\cnq3-x86.exe + $(QUAKE3DIR)\cnq3.exe $(QUAKE3DIR) WindowsLocalDebugger +set fs_game $(CPMADIR) +set sv_pure 0 +set r_fullscreen 0 diff --git a/makefiles/windows_vs2019/libjpeg-turbo.vcxproj b/makefiles/windows_vs2019/libjpeg-turbo.vcxproj index 0678864..1f31a65 100644 --- a/makefiles/windows_vs2019/libjpeg-turbo.vcxproj +++ b/makefiles/windows_vs2019/libjpeg-turbo.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {DB56484D-4717-C483-1052-0D017CD10860} @@ -31,12 +23,6 @@ Unicode v142 - - StaticLibrary - true - Unicode - v142 - StaticLibrary false @@ -44,53 +30,26 @@ v142 true - - StaticLibrary - false - Unicode - v142 - true - - - - - - - - ..\..\.build\debug_x64\ - ..\..\.build\debug_x64\libjpeg-turbo\ - libjpeg-turbo - .lib - false - - - ..\..\.build\debug_x32\ - ..\..\.build\debug_x32\libjpeg-turbo\ + ..\..\.build\debug\ + ..\..\.build\debug\libjpeg-turbo\ libjpeg-turbo .lib false - ..\..\.build\release_x64\ - ..\..\.build\release_x64\libjpeg-turbo\ - libjpeg-turbo - .lib - false - - - ..\..\.build\release_x32\ - ..\..\.build\release_x32\libjpeg-turbo\ + ..\..\.build\release\ + ..\..\.build\release\libjpeg-turbo\ libjpeg-turbo .lib false @@ -114,30 +73,7 @@ true - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level3 - WITH_SIMD;SIZEOF_SIZE_T=4;DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\libjpeg-turbo;..\..\code\libjpeg-turbo\simd;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - - - Windows - true - - - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -170,41 +106,7 @@ true - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level3 - Default - WITH_SIMD;SIZEOF_SIZE_T=4;NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\libjpeg-turbo;..\..\code\libjpeg-turbo\simd;%(AdditionalIncludeDirectories) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - - - Windows - true - true - true - - - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -254,465 +156,120 @@ - - true - true - - - true - true - + - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jccolor-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jccolor-mmx.obj - %(Filename).asm - %(Filename).asm - Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jccolor-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jccolor-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jccolor-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jccolor-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jcgray-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jcgray-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jccolor-sse2-64.obj + ../../.build/release/libjpeg-turbo/jccolor-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jcgray-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jcgray-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jcgray-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jcgray-sse2.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jcgray-sse2-64.obj + ../../.build/release/libjpeg-turbo/jcgray-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jchuff-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jchuff-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jchuff-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jchuff-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jcsample-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jcsample-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jchuff-sse2-64.obj + ../../.build/release/libjpeg-turbo/jchuff-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jcsample-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jcsample-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jcsample-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jcsample-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdcolor-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jdcolor-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jcsample-sse2-64.obj + ../../.build/release/libjpeg-turbo/jcsample-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jdcolor-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jdcolor-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdcolor-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jdcolor-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdmerge-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jdmerge-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jdcolor-sse2-64.obj + ../../.build/release/libjpeg-turbo/jdcolor-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jdmerge-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jdmerge-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdmerge-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jdmerge-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdsample-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jdsample-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jdmerge-sse2-64.obj + ../../.build/release/libjpeg-turbo/jdmerge-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jdsample-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jdsample-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdsample-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jdsample-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctflt-3dn.obj - ../../.build/release_x32/libjpeg-turbo/jfdctflt-3dn.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jdsample-sse2-64.obj + ../../.build/release/libjpeg-turbo/jdsample-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jfdctflt-sse-64.obj - ../../.build/release_x64/libjpeg-turbo/jfdctflt-sse-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctflt-sse.obj - ../../.build/release_x32/libjpeg-turbo/jfdctflt-sse.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctfst-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jfdctfst-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jfdctflt-sse-64.obj + ../../.build/release/libjpeg-turbo/jfdctflt-sse-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jfdctfst-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jfdctfst-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctfst-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jfdctfst-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctint-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jfdctint-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jfdctfst-sse2-64.obj + ../../.build/release/libjpeg-turbo/jfdctfst-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jfdctint-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jfdctint-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctint-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jfdctint-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctflt-3dn.obj - ../../.build/release_x32/libjpeg-turbo/jidctflt-3dn.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctflt-sse.obj - ../../.build/release_x32/libjpeg-turbo/jidctflt-sse.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jfdctint-sse2-64.obj + ../../.build/release/libjpeg-turbo/jfdctint-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jidctflt-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jidctflt-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctflt-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jidctflt-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctfst-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jidctfst-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jidctflt-sse2-64.obj + ../../.build/release/libjpeg-turbo/jidctflt-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jidctfst-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jidctfst-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctfst-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jidctfst-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctint-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jidctint-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jidctfst-sse2-64.obj + ../../.build/release/libjpeg-turbo/jidctfst-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jidctint-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jidctint-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctint-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jidctint-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctred-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jidctred-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jidctint-sse2-64.obj + ../../.build/release/libjpeg-turbo/jidctint-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jidctred-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jidctred-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctred-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jidctred-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquant-3dn.obj - ../../.build/release_x32/libjpeg-turbo/jquant-3dn.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquant-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jquant-mmx.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquant-sse.obj - ../../.build/release_x32/libjpeg-turbo/jquant-sse.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jidctred-sse2-64.obj + ../../.build/release/libjpeg-turbo/jidctred-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jquantf-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jquantf-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquantf-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jquantf-sse2.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jquantf-sse2-64.obj + ../../.build/release/libjpeg-turbo/jquantf-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jquanti-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jquanti-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquanti-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jquanti-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jsimdcpu.obj - ../../.build/release_x32/libjpeg-turbo/jsimdcpu.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jquanti-sse2-64.obj + ../../.build/release/libjpeg-turbo/jquanti-sse2-64.obj + %(Filename).asm diff --git a/makefiles/windows_vs2019/libjpeg-turbo.vcxproj.filters b/makefiles/windows_vs2019/libjpeg-turbo.vcxproj.filters index 97cbc5b..cd71862 100644 --- a/makefiles/windows_vs2019/libjpeg-turbo.vcxproj.filters +++ b/makefiles/windows_vs2019/libjpeg-turbo.vcxproj.filters @@ -51,163 +51,58 @@ - - simd - simd - - simd - simd - - simd - - - simd - simd - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - - - simd - - - simd - simd - - simd - simd - - simd - - - simd - \ No newline at end of file diff --git a/makefiles/windows_vs2019/renderer.vcxproj b/makefiles/windows_vs2019/renderer.vcxproj index c1a5bfe..8c30655 100644 --- a/makefiles/windows_vs2019/renderer.vcxproj +++ b/makefiles/windows_vs2019/renderer.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1} @@ -31,12 +23,6 @@ Unicode v142 - - StaticLibrary - true - Unicode - v142 - StaticLibrary false @@ -44,53 +30,26 @@ v142 true - - StaticLibrary - false - Unicode - v142 - true - - - - - - - - ..\..\.build\debug_x64\ - ..\..\.build\debug_x64\renderer\ - renderer - .lib - false - - - ..\..\.build\debug_x32\ - ..\..\.build\debug_x32\renderer\ + ..\..\.build\debug\ + ..\..\.build\debug\renderer\ renderer .lib false - ..\..\.build\release_x64\ - ..\..\.build\release_x64\renderer\ - renderer - .lib - false - - - ..\..\.build\release_x32\ - ..\..\.build\release_x32\renderer\ + ..\..\.build\release\ + ..\..\.build\release\renderer\ renderer .lib false @@ -114,30 +73,7 @@ true - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level4 - DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\imgui;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - - - Windows - true - - - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -170,41 +106,7 @@ true - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level4 - Default - NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\imgui;%(AdditionalIncludeDirectories) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - - - Windows - true - true - true - - - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) %(AdditionalOptions) diff --git a/makefiles/windows_vs2019/shadercomp.vcxproj b/makefiles/windows_vs2019/shadercomp.vcxproj index db0fcf6..0a7ed85 100644 --- a/makefiles/windows_vs2019/shadercomp.vcxproj +++ b/makefiles/windows_vs2019/shadercomp.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921} @@ -31,12 +23,6 @@ Unicode v142 - - Application - true - Unicode - v142 - Application false @@ -44,57 +30,28 @@ v142 true - - Application - false - Unicode - v142 - true - - - - - - - true - ..\..\.bin\debug_x64\ - ..\..\.build\debug_x64\shadercomp\ - shadercomp - .exe - false - - - true - ..\..\.bin\debug_x32\ - ..\..\.build\debug_x32\shadercomp\ + ..\..\.bin\debug\ + ..\..\.build\debug\shadercomp\ shadercomp .exe false false - ..\..\.bin\release_x64\ - ..\..\.build\release_x64\shadercomp\ - shadercomp - .exe - false - - - false - ..\..\.bin\release_x32\ - ..\..\.build\release_x32\shadercomp\ + ..\..\.bin\release\ + ..\..\.build\release\shadercomp\ shadercomp .exe false @@ -115,32 +72,7 @@ Console true - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - copy /B /Y "$(TargetDir)\$(TargetName).exe" "..\..\code\renderer\hlsl" -copy /B /Y "$(TargetDir)\$(TargetName).pdb" "..\..\code\renderer\hlsl" -"../../code/renderer/hlsl/$(TargetFileName)" - - - - - NotUsing - Level4 - DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - - - Console - true - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -175,43 +107,7 @@ copy /B /Y "$(TargetDir)\$(TargetName).pdb" "..\..\code\renderer\hlsl" true true true - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - copy /B /Y "$(TargetDir)\$(TargetName).exe" "..\..\code\renderer\hlsl" -copy /B /Y "$(TargetDir)\$(TargetName).pdb" "..\..\code\renderer\hlsl" -"../../code/renderer/hlsl/$(TargetFileName)" - - - - - NotUsing - Level4 - Default - NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - - - Console - true - true - true - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) %(AdditionalOptions) diff --git a/makefiles/windows_vs2022/botlib.vcxproj b/makefiles/windows_vs2022/botlib.vcxproj index e8ae885..7299d2e 100644 --- a/makefiles/windows_vs2022/botlib.vcxproj +++ b/makefiles/windows_vs2022/botlib.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {A1A792F4-8D49-BDCA-7604-D11E6245441B} @@ -31,12 +23,6 @@ Unicode v143 - - StaticLibrary - true - Unicode - v143 - StaticLibrary false @@ -44,53 +30,26 @@ v143 true - - StaticLibrary - false - Unicode - v143 - true - - - - - - - - ..\..\.build\debug_x64\ - ..\..\.build\debug_x64\botlib\ - botlib - .lib - false - - - ..\..\.build\debug_x32\ - ..\..\.build\debug_x32\botlib\ + ..\..\.build\debug\ + ..\..\.build\debug\botlib\ botlib .lib false - ..\..\.build\release_x64\ - ..\..\.build\release_x64\botlib\ - botlib - .lib - false - - - ..\..\.build\release_x32\ - ..\..\.build\release_x32\botlib\ + ..\..\.build\release\ + ..\..\.build\release\botlib\ botlib .lib false @@ -114,30 +73,7 @@ true - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level4 - BOTLIB;DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - - - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -170,41 +106,7 @@ true - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level4 - Default - BOTLIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - true - true - - - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) %(AdditionalOptions) diff --git a/makefiles/windows_vs2022/cnq3-server.vcxproj b/makefiles/windows_vs2022/cnq3-server.vcxproj index 44c423d..2c1bf2d 100644 --- a/makefiles/windows_vs2022/cnq3-server.vcxproj +++ b/makefiles/windows_vs2022/cnq3-server.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B} @@ -31,12 +23,6 @@ Unicode v143 - - Application - true - Unicode - v143 - Application false @@ -44,58 +30,29 @@ v143 true - - Application - false - Unicode - v143 - true - - - - - - - true - ..\..\.bin\debug_x64\ - ..\..\.build\debug_x64\cnq3-server\ - cnq3-server-x64 - .exe - false - - - true - ..\..\.bin\debug_x32\ - ..\..\.build\debug_x32\cnq3-server\ - cnq3-server-x86 + ..\..\.bin\debug\ + ..\..\.build\debug\cnq3-server\ + cnq3-server .exe false false - ..\..\.bin\release_x64\ - ..\..\.build\release_x64\cnq3-server\ - cnq3-server-x64 - .exe - false - - - false - ..\..\.bin\release_x32\ - ..\..\.build\release_x32\cnq3-server\ - cnq3-server-x86 + ..\..\.bin\release\ + ..\..\.build\release\cnq3-server\ + cnq3-server .exe false @@ -117,7 +74,7 @@ Windows true Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies) - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) WinMainCRTStartup ..\..\code\win32\winquake.res /STACK:8388608 %(AdditionalOptions) @@ -125,38 +82,8 @@ "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - copy "..\..\.bin\debug_x64\cnq3-server-x64.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\debug_x64\cnq3-server-x64.pdb" "$(QUAKE3DIR)" - - - - - NotUsing - Level4 - DEDICATED;DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies) - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) - WinMainCRTStartup - ..\..\code\win32\winquake.res /STACK:8388608 %(AdditionalOptions) - - - "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - - - copy "..\..\.bin\debug_x32\cnq3-server-x86.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\debug_x32\cnq3-server-x86.pdb" "$(QUAKE3DIR)" + copy "..\..\.bin\debug\cnq3-server.exe" "$(QUAKE3DIR)" +copy "..\..\.bin\debug\cnq3-server.pdb" "$(QUAKE3DIR)" @@ -187,7 +114,7 @@ copy "..\..\.bin\debug_x32\cnq3-server-x86.pdb" "$(QUAKE3DIR)" true true Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies) - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) WinMainCRTStartup ..\..\code\win32\winquake.res /STACK:8388608 /OPT:REF /OPT:ICF %(AdditionalOptions) @@ -195,49 +122,8 @@ copy "..\..\.bin\debug_x32\cnq3-server-x86.pdb" "$(QUAKE3DIR)" "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - copy "..\..\.bin\release_x64\cnq3-server-x64.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\release_x64\cnq3-server-x64.pdb" "$(QUAKE3DIR)" - - - - - NotUsing - Level4 - Default - DEDICATED;NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - true - true - Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies) - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) - WinMainCRTStartup - ..\..\code\win32\winquake.res /STACK:8388608 /OPT:REF /OPT:ICF %(AdditionalOptions) - - - "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - - - copy "..\..\.bin\release_x32\cnq3-server-x86.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\release_x32\cnq3-server-x86.pdb" "$(QUAKE3DIR)" + copy "..\..\.bin\release\cnq3-server.exe" "$(QUAKE3DIR)" +copy "..\..\.bin\release\cnq3-server.pdb" "$(QUAKE3DIR)" diff --git a/makefiles/windows_vs2022/cnq3-server.vcxproj.user b/makefiles/windows_vs2022/cnq3-server.vcxproj.user index 74d2a65..e452838 100644 --- a/makefiles/windows_vs2022/cnq3-server.vcxproj.user +++ b/makefiles/windows_vs2022/cnq3-server.vcxproj.user @@ -1,25 +1,13 @@ - $(QUAKE3DIR)\cnq3-server-x64.exe - $(QUAKE3DIR) - WindowsLocalDebugger - +set fs_game $(CPMADIR) +set sv_pure 0 - - - $(QUAKE3DIR)\cnq3-server-x86.exe + $(QUAKE3DIR)\cnq3-server.exe $(QUAKE3DIR) WindowsLocalDebugger +set fs_game $(CPMADIR) +set sv_pure 0 - $(QUAKE3DIR)\cnq3-server-x64.exe - $(QUAKE3DIR) - WindowsLocalDebugger - +set fs_game $(CPMADIR) +set sv_pure 0 - - - $(QUAKE3DIR)\cnq3-server-x86.exe + $(QUAKE3DIR)\cnq3-server.exe $(QUAKE3DIR) WindowsLocalDebugger +set fs_game $(CPMADIR) +set sv_pure 0 diff --git a/makefiles/windows_vs2022/cnq3.sln b/makefiles/windows_vs2022/cnq3.sln index 1228925..1ba5956 100644 --- a/makefiles/windows_vs2022/cnq3.sln +++ b/makefiles/windows_vs2022/cnq3.sln @@ -18,58 +18,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shadercomp", "shadercomp.vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug|Win32 = debug|Win32 debug|x64 = debug|x64 - release|Win32 = release|Win32 release|x64 = release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A1A792F4-8D49-BDCA-7604-D11E6245441B}.debug|Win32.ActiveCfg = debug|Win32 - {A1A792F4-8D49-BDCA-7604-D11E6245441B}.debug|Win32.Build.0 = debug|Win32 {A1A792F4-8D49-BDCA-7604-D11E6245441B}.debug|x64.ActiveCfg = debug|x64 {A1A792F4-8D49-BDCA-7604-D11E6245441B}.debug|x64.Build.0 = debug|x64 - {A1A792F4-8D49-BDCA-7604-D11E6245441B}.release|Win32.ActiveCfg = release|Win32 - {A1A792F4-8D49-BDCA-7604-D11E6245441B}.release|Win32.Build.0 = release|Win32 {A1A792F4-8D49-BDCA-7604-D11E6245441B}.release|x64.ActiveCfg = release|x64 {A1A792F4-8D49-BDCA-7604-D11E6245441B}.release|x64.Build.0 = release|x64 - {BA3B957C-A672-960D-4F5F-7C103B75120F}.debug|Win32.ActiveCfg = debug|Win32 - {BA3B957C-A672-960D-4F5F-7C103B75120F}.debug|Win32.Build.0 = debug|Win32 {BA3B957C-A672-960D-4F5F-7C103B75120F}.debug|x64.ActiveCfg = debug|x64 {BA3B957C-A672-960D-4F5F-7C103B75120F}.debug|x64.Build.0 = debug|x64 - {BA3B957C-A672-960D-4F5F-7C103B75120F}.release|Win32.ActiveCfg = release|Win32 - {BA3B957C-A672-960D-4F5F-7C103B75120F}.release|Win32.Build.0 = release|Win32 {BA3B957C-A672-960D-4F5F-7C103B75120F}.release|x64.ActiveCfg = release|x64 {BA3B957C-A672-960D-4F5F-7C103B75120F}.release|x64.Build.0 = release|x64 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.debug|Win32.ActiveCfg = debug|Win32 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.debug|Win32.Build.0 = debug|Win32 {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.debug|x64.ActiveCfg = debug|x64 {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.debug|x64.Build.0 = debug|x64 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.release|Win32.ActiveCfg = release|Win32 - {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.release|Win32.Build.0 = release|Win32 {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.release|x64.ActiveCfg = release|x64 {3EA67B52-AA5B-F447-3350-EE1E9F04EB4B}.release|x64.Build.0 = release|x64 - {DB56484D-4717-C483-1052-0D017CD10860}.debug|Win32.ActiveCfg = debug|Win32 - {DB56484D-4717-C483-1052-0D017CD10860}.debug|Win32.Build.0 = debug|Win32 {DB56484D-4717-C483-1052-0D017CD10860}.debug|x64.ActiveCfg = debug|x64 {DB56484D-4717-C483-1052-0D017CD10860}.debug|x64.Build.0 = debug|x64 - {DB56484D-4717-C483-1052-0D017CD10860}.release|Win32.ActiveCfg = release|Win32 - {DB56484D-4717-C483-1052-0D017CD10860}.release|Win32.Build.0 = release|Win32 {DB56484D-4717-C483-1052-0D017CD10860}.release|x64.ActiveCfg = release|x64 {DB56484D-4717-C483-1052-0D017CD10860}.release|x64.Build.0 = release|x64 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.debug|Win32.ActiveCfg = debug|Win32 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.debug|Win32.Build.0 = debug|Win32 {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.debug|x64.ActiveCfg = debug|x64 {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.debug|x64.Build.0 = debug|x64 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.release|Win32.ActiveCfg = release|Win32 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.release|Win32.Build.0 = release|Win32 {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.release|x64.ActiveCfg = release|x64 {9C6AA017-8837-FB22-B150-E9CA9D7C30B1}.release|x64.Build.0 = release|x64 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.debug|Win32.ActiveCfg = debug|Win32 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.debug|Win32.Build.0 = debug|Win32 {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.debug|x64.ActiveCfg = debug|x64 {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.debug|x64.Build.0 = debug|x64 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.release|Win32.ActiveCfg = release|Win32 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.release|Win32.Build.0 = release|Win32 {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.release|x64.ActiveCfg = release|x64 {4B7F8CE3-3737-CE30-A03E-A78C8C156921}.release|x64.Build.0 = release|x64 EndGlobalSection diff --git a/makefiles/windows_vs2022/cnq3.vcxproj b/makefiles/windows_vs2022/cnq3.vcxproj index d6dfa82..8381897 100644 --- a/makefiles/windows_vs2022/cnq3.vcxproj +++ b/makefiles/windows_vs2022/cnq3.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {BA3B957C-A672-960D-4F5F-7C103B75120F} @@ -31,12 +23,6 @@ Unicode v143 - - Application - true - Unicode - v143 - Application false @@ -44,58 +30,29 @@ v143 true - - Application - false - Unicode - v143 - true - - - - - - - true - ..\..\.bin\debug_x64\ - ..\..\.build\debug_x64\cnq3\ - cnq3-x64 - .exe - false - - - true - ..\..\.bin\debug_x32\ - ..\..\.build\debug_x32\cnq3\ - cnq3-x86 + ..\..\.bin\debug\ + ..\..\.build\debug\cnq3\ + cnq3 .exe false false - ..\..\.bin\release_x64\ - ..\..\.build\release_x64\cnq3\ - cnq3-x64 - .exe - false - - - false - ..\..\.bin\release_x32\ - ..\..\.build\release_x32\cnq3\ - cnq3-x86 + ..\..\.bin\release\ + ..\..\.build\release\cnq3\ + cnq3 .exe false @@ -118,7 +75,7 @@ Windows true Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;D3D12.lib;DXGI.lib;Dwmapi.lib;nvapi64.lib;%(AdditionalDependencies) - ..\..\code\nvapi;..\..\.build\debug_x64;%(AdditionalLibraryDirectories) + ..\..\code\nvapi;..\..\.build\debug;%(AdditionalLibraryDirectories) WinMainCRTStartup ..\..\code\win32\winquake.res /STACK:8388608 /MANIFEST:EMBED /MANIFESTINPUT:..\..\code\win32\client.manifest %(AdditionalOptions) @@ -126,39 +83,8 @@ "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - copy "..\..\.bin\debug_x64\cnq3-x64.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\debug_x64\cnq3-x64.pdb" "$(QUAKE3DIR)" - - - - - NotUsing - Level4 - DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\imgui;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;D3D12.lib;DXGI.lib;Dwmapi.lib;nvapi64.lib;%(AdditionalDependencies) - ..\..\code\nvapi;..\..\.build\debug_x32;%(AdditionalLibraryDirectories) - WinMainCRTStartup - ..\..\code\win32\winquake.res /STACK:8388608 /MANIFEST:EMBED /MANIFESTINPUT:..\..\code\win32\client.manifest %(AdditionalOptions) - - - "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - - - copy "..\..\.bin\debug_x32\cnq3-x86.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\debug_x32\cnq3-x86.pdb" "$(QUAKE3DIR)" + copy "..\..\.bin\debug\cnq3.exe" "$(QUAKE3DIR)" +copy "..\..\.bin\debug\cnq3.pdb" "$(QUAKE3DIR)" @@ -190,7 +116,7 @@ copy "..\..\.bin\debug_x32\cnq3-x86.pdb" "$(QUAKE3DIR)" true true Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;D3D12.lib;DXGI.lib;Dwmapi.lib;nvapi64.lib;%(AdditionalDependencies) - ..\..\code\nvapi;..\..\.build\release_x64;%(AdditionalLibraryDirectories) + ..\..\code\nvapi;..\..\.build\release;%(AdditionalLibraryDirectories) WinMainCRTStartup ..\..\code\win32\winquake.res /STACK:8388608 /MANIFEST:EMBED /MANIFESTINPUT:..\..\code\win32\client.manifest /OPT:REF /OPT:ICF %(AdditionalOptions) @@ -198,50 +124,8 @@ copy "..\..\.bin\debug_x32\cnq3-x86.pdb" "$(QUAKE3DIR)" "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - copy "..\..\.bin\release_x64\cnq3-x64.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\release_x64\cnq3-x64.pdb" "$(QUAKE3DIR)" - - - - - NotUsing - Level4 - Default - NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\imgui;%(AdditionalIncludeDirectories) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - true - true - Winmm.lib;ws2_32.lib;Version.lib;Shlwapi.lib;D3D12.lib;DXGI.lib;Dwmapi.lib;nvapi64.lib;%(AdditionalDependencies) - ..\..\code\nvapi;..\..\.build\release_x32;%(AdditionalLibraryDirectories) - WinMainCRTStartup - ..\..\code\win32\winquake.res /STACK:8388608 /MANIFEST:EMBED /MANIFESTINPUT:..\..\code\win32\client.manifest /OPT:REF /OPT:ICF %(AdditionalOptions) - - - "..\create_git_header.cmd" "..\..\code\qcommon\git.h" - - - copy "..\..\.bin\release_x32\cnq3-x86.exe" "$(QUAKE3DIR)" -copy "..\..\.bin\release_x32\cnq3-x86.pdb" "$(QUAKE3DIR)" + copy "..\..\.bin\release\cnq3.exe" "$(QUAKE3DIR)" +copy "..\..\.bin\release\cnq3.pdb" "$(QUAKE3DIR)" diff --git a/makefiles/windows_vs2022/cnq3.vcxproj.user b/makefiles/windows_vs2022/cnq3.vcxproj.user index 7b083f0..dd3c3f8 100644 --- a/makefiles/windows_vs2022/cnq3.vcxproj.user +++ b/makefiles/windows_vs2022/cnq3.vcxproj.user @@ -1,25 +1,13 @@ - $(QUAKE3DIR)\cnq3-x64.exe - $(QUAKE3DIR) - WindowsLocalDebugger - +set fs_game $(CPMADIR) +set sv_pure 0 +set r_fullscreen 0 - - - $(QUAKE3DIR)\cnq3-x86.exe + $(QUAKE3DIR)\cnq3.exe $(QUAKE3DIR) WindowsLocalDebugger +set fs_game $(CPMADIR) +set sv_pure 0 +set r_fullscreen 0 - $(QUAKE3DIR)\cnq3-x64.exe - $(QUAKE3DIR) - WindowsLocalDebugger - +set fs_game $(CPMADIR) +set sv_pure 0 +set r_fullscreen 0 - - - $(QUAKE3DIR)\cnq3-x86.exe + $(QUAKE3DIR)\cnq3.exe $(QUAKE3DIR) WindowsLocalDebugger +set fs_game $(CPMADIR) +set sv_pure 0 +set r_fullscreen 0 diff --git a/makefiles/windows_vs2022/libjpeg-turbo.vcxproj b/makefiles/windows_vs2022/libjpeg-turbo.vcxproj index 9d1cb9c..949f60e 100644 --- a/makefiles/windows_vs2022/libjpeg-turbo.vcxproj +++ b/makefiles/windows_vs2022/libjpeg-turbo.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {DB56484D-4717-C483-1052-0D017CD10860} @@ -31,12 +23,6 @@ Unicode v143 - - StaticLibrary - true - Unicode - v143 - StaticLibrary false @@ -44,53 +30,26 @@ v143 true - - StaticLibrary - false - Unicode - v143 - true - - - - - - - - ..\..\.build\debug_x64\ - ..\..\.build\debug_x64\libjpeg-turbo\ - libjpeg-turbo - .lib - false - - - ..\..\.build\debug_x32\ - ..\..\.build\debug_x32\libjpeg-turbo\ + ..\..\.build\debug\ + ..\..\.build\debug\libjpeg-turbo\ libjpeg-turbo .lib false - ..\..\.build\release_x64\ - ..\..\.build\release_x64\libjpeg-turbo\ - libjpeg-turbo - .lib - false - - - ..\..\.build\release_x32\ - ..\..\.build\release_x32\libjpeg-turbo\ + ..\..\.build\release\ + ..\..\.build\release\libjpeg-turbo\ libjpeg-turbo .lib false @@ -115,31 +74,7 @@ true - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level3 - WITH_SIMD;SIZEOF_SIZE_T=4;DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\libjpeg-turbo;..\..\code\libjpeg-turbo\simd;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - - - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -173,42 +108,7 @@ true - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level3 - Default - WITH_SIMD;SIZEOF_SIZE_T=4;NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\libjpeg-turbo;..\..\code\libjpeg-turbo\simd;%(AdditionalIncludeDirectories) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - true - true - - - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -258,465 +158,120 @@ - - true - true - - - true - true - + - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jccolor-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jccolor-mmx.obj - %(Filename).asm - %(Filename).asm - Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jccolor-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jccolor-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jccolor-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jccolor-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jcgray-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jcgray-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jccolor-sse2-64.obj + ../../.build/release/libjpeg-turbo/jccolor-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jcgray-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jcgray-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jcgray-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jcgray-sse2.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jcgray-sse2-64.obj + ../../.build/release/libjpeg-turbo/jcgray-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jchuff-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jchuff-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jchuff-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jchuff-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jcsample-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jcsample-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jchuff-sse2-64.obj + ../../.build/release/libjpeg-turbo/jchuff-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jcsample-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jcsample-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jcsample-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jcsample-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdcolor-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jdcolor-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jcsample-sse2-64.obj + ../../.build/release/libjpeg-turbo/jcsample-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jdcolor-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jdcolor-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdcolor-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jdcolor-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdmerge-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jdmerge-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jdcolor-sse2-64.obj + ../../.build/release/libjpeg-turbo/jdcolor-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jdmerge-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jdmerge-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdmerge-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jdmerge-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdsample-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jdsample-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jdmerge-sse2-64.obj + ../../.build/release/libjpeg-turbo/jdmerge-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jdsample-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jdsample-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jdsample-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jdsample-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctflt-3dn.obj - ../../.build/release_x32/libjpeg-turbo/jfdctflt-3dn.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jdsample-sse2-64.obj + ../../.build/release/libjpeg-turbo/jdsample-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jfdctflt-sse-64.obj - ../../.build/release_x64/libjpeg-turbo/jfdctflt-sse-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctflt-sse.obj - ../../.build/release_x32/libjpeg-turbo/jfdctflt-sse.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctfst-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jfdctfst-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jfdctflt-sse-64.obj + ../../.build/release/libjpeg-turbo/jfdctflt-sse-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jfdctfst-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jfdctfst-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctfst-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jfdctfst-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctint-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jfdctint-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jfdctfst-sse2-64.obj + ../../.build/release/libjpeg-turbo/jfdctfst-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jfdctint-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jfdctint-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jfdctint-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jfdctint-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctflt-3dn.obj - ../../.build/release_x32/libjpeg-turbo/jidctflt-3dn.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctflt-sse.obj - ../../.build/release_x32/libjpeg-turbo/jidctflt-sse.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jfdctint-sse2-64.obj + ../../.build/release/libjpeg-turbo/jfdctint-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jidctflt-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jidctflt-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctflt-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jidctflt-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctfst-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jidctfst-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jidctflt-sse2-64.obj + ../../.build/release/libjpeg-turbo/jidctflt-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jidctfst-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jidctfst-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctfst-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jidctfst-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctint-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jidctint-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jidctfst-sse2-64.obj + ../../.build/release/libjpeg-turbo/jidctfst-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jidctint-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jidctint-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctint-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jidctint-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctred-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jidctred-mmx.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jidctint-sse2-64.obj + ../../.build/release/libjpeg-turbo/jidctint-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jidctred-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jidctred-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jidctred-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jidctred-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquant-3dn.obj - ../../.build/release_x32/libjpeg-turbo/jquant-3dn.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquant-mmx.obj - ../../.build/release_x32/libjpeg-turbo/jquant-mmx.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquant-sse.obj - ../../.build/release_x32/libjpeg-turbo/jquant-sse.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jidctred-sse2-64.obj + ../../.build/release/libjpeg-turbo/jidctred-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jquantf-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jquantf-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquantf-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jquantf-sse2.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jquantf-sse2-64.obj + ../../.build/release/libjpeg-turbo/jquantf-sse2-64.obj + %(Filename).asm Document - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x64/libjpeg-turbo/jquanti-sse2-64.obj - ../../.build/release_x64/libjpeg-turbo/jquanti-sse2-64.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jquanti-sse2.obj - ../../.build/release_x32/libjpeg-turbo/jquanti-sse2.obj - %(Filename).asm - %(Filename).asm - - - Document - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - nasm -o$(IntDir)\%(Filename).obj -fwin32 -DWIN32 -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) - ../../.build/debug_x32/libjpeg-turbo/jsimdcpu.obj - ../../.build/release_x32/libjpeg-turbo/jsimdcpu.obj - %(Filename).asm - %(Filename).asm + nasm -o$(IntDir)\%(Filename).obj -fwin64 -DWIN64 -D__x86_64__ -I..\..\code\libjpeg-turbo\ -I..\..\code\libjpeg-turbo\win\ -I..\..\code\libjpeg-turbo\simd\ %(Identity) + ../../.build/debug/libjpeg-turbo/jquanti-sse2-64.obj + ../../.build/release/libjpeg-turbo/jquanti-sse2-64.obj + %(Filename).asm diff --git a/makefiles/windows_vs2022/libjpeg-turbo.vcxproj.filters b/makefiles/windows_vs2022/libjpeg-turbo.vcxproj.filters index 97cbc5b..cd71862 100644 --- a/makefiles/windows_vs2022/libjpeg-turbo.vcxproj.filters +++ b/makefiles/windows_vs2022/libjpeg-turbo.vcxproj.filters @@ -51,163 +51,58 @@ - - simd - simd - - simd - simd - - simd - - - simd - simd - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - simd - - simd - - - simd - - - simd - - - simd - simd - - simd - simd - - simd - - - simd - \ No newline at end of file diff --git a/makefiles/windows_vs2022/renderer.vcxproj b/makefiles/windows_vs2022/renderer.vcxproj index b802b99..0de116d 100644 --- a/makefiles/windows_vs2022/renderer.vcxproj +++ b/makefiles/windows_vs2022/renderer.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {9C6AA017-8837-FB22-B150-E9CA9D7C30B1} @@ -31,12 +23,6 @@ Unicode v143 - - StaticLibrary - true - Unicode - v143 - StaticLibrary false @@ -44,53 +30,26 @@ v143 true - - StaticLibrary - false - Unicode - v143 - true - - - - - - - - ..\..\.build\debug_x64\ - ..\..\.build\debug_x64\renderer\ - renderer - .lib - false - - - ..\..\.build\debug_x32\ - ..\..\.build\debug_x32\renderer\ + ..\..\.build\debug\ + ..\..\.build\debug\renderer\ renderer .lib false - ..\..\.build\release_x64\ - ..\..\.build\release_x64\renderer\ - renderer - .lib - false - - - ..\..\.build\release_x32\ - ..\..\.build\release_x32\renderer\ + ..\..\.build\release\ + ..\..\.build\release\renderer\ renderer .lib false @@ -115,31 +74,7 @@ true - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level4 - DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\imgui;%(AdditionalIncludeDirectories) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - - - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -173,42 +108,7 @@ true - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - - - NotUsing - Level4 - Default - NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ..\..\code\imgui;%(AdditionalIncludeDirectories) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - Level3 - - - Windows - true - true - true - - - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) %(AdditionalOptions) diff --git a/makefiles/windows_vs2022/shadercomp.vcxproj b/makefiles/windows_vs2022/shadercomp.vcxproj index b08635c..e0388b0 100644 --- a/makefiles/windows_vs2022/shadercomp.vcxproj +++ b/makefiles/windows_vs2022/shadercomp.vcxproj @@ -5,18 +5,10 @@ debug x64 - - debug - Win32 - release x64 - - release - Win32 - {4B7F8CE3-3737-CE30-A03E-A78C8C156921} @@ -31,12 +23,6 @@ Unicode v143 - - Application - true - Unicode - v143 - Application false @@ -44,57 +30,28 @@ v143 true - - Application - false - Unicode - v143 - true - - - - - - - true - ..\..\.bin\debug_x64\ - ..\..\.build\debug_x64\shadercomp\ - shadercomp - .exe - false - - - true - ..\..\.bin\debug_x32\ - ..\..\.build\debug_x32\shadercomp\ + ..\..\.bin\debug\ + ..\..\.build\debug\shadercomp\ shadercomp .exe false false - ..\..\.bin\release_x64\ - ..\..\.build\release_x64\shadercomp\ - shadercomp - .exe - false - - - false - ..\..\.bin\release_x32\ - ..\..\.build\release_x32\shadercomp\ + ..\..\.bin\release\ + ..\..\.build\release\shadercomp\ shadercomp .exe false @@ -116,33 +73,7 @@ Console true - ..\..\.build\debug_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - copy /B /Y "$(TargetDir)\$(TargetName).exe" "..\..\code\renderer\hlsl" -copy /B /Y "$(TargetDir)\$(TargetName).pdb" "..\..\code\renderer\hlsl" -"../../code/renderer/hlsl/$(TargetFileName)" - - - - - NotUsing - Level4 - DEBUG;_DEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - Disabled - MultiThreadedDebug - false - false - false - /arch:SSE2 %(AdditionalOptions) - Level3 - - - Console - true - ..\..\.build\debug_x32;%(AdditionalLibraryDirectories) + ..\..\.build\debug;%(AdditionalLibraryDirectories) %(AdditionalOptions) @@ -178,44 +109,7 @@ copy /B /Y "$(TargetDir)\$(TargetName).pdb" "..\..\code\renderer\hlsl" true true true - ..\..\.build\release_x64;%(AdditionalLibraryDirectories) - %(AdditionalOptions) - - - copy /B /Y "$(TargetDir)\$(TargetName).exe" "..\..\code\renderer\hlsl" -copy /B /Y "$(TargetDir)\$(TargetName).pdb" "..\..\code\renderer\hlsl" -"../../code/renderer/hlsl/$(TargetFileName)" - - - - - NotUsing - Level4 - Default - NDEBUG;_CRT_SECURE_NO_WARNINGS;WIN32;_WIN32;_HAS_EXCEPTIONS=0;%(PreprocessorDefinitions) - ProgramDatabase - MinSpace - true - true - false - true - true - MultiThreaded - false - false - false - Fast - StreamingSIMDExtensions2 - true - /GL /arch:SSE2 %(AdditionalOptions) - Level3 - - - Console - true - true - true - ..\..\.build\release_x32;%(AdditionalLibraryDirectories) + ..\..\.build\release;%(AdditionalLibraryDirectories) %(AdditionalOptions)