fix for release compile

kochol · Jan 16, 2021 · d86f98d · d86f98d
1 parent 8bc1997
commit d86f98d
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 4 deletions.
diff --git a/Beef/ari_2d/BeefProj.toml b/Beef/ari_2d/BeefProj.toml
@@ -9,3 +9,6 @@ DefaultNamespace = "ari.en"
 
 [Configs.Debug.Win64]
 LibPaths = ["$(ProjectDir)/../dist/win64/Debug/cari_2d.lib", "$(ProjectDir)/../dist/win64/Debug/ari_2d.lib"]
+
+[Configs.Release.Win64]
+LibPaths = ["$(ProjectDir)/../dist/win64/Release/cari_2d.lib", "$(ProjectDir)/../dist/win64/Release/ari_2d.lib"]
diff --git a/Beef/ari_3d/BeefProj.toml b/Beef/ari_3d/BeefProj.toml
@@ -10,3 +10,5 @@ DefaultNamespace = "ari.en"
 [Configs.Debug.Win64]
 LibPaths = ["$(ProjectDir)/../dist/win64/Debug/cari_3d.lib", "$(ProjectDir)/../dist/win64/Debug/ari_3d.lib"]
 
+[Configs.Release.Win64]
+LibPaths = ["$(ProjectDir)/../dist/win64/Release/cari_3d.lib", "$(ProjectDir)/../dist/win64/Release/ari_3d.lib"]
diff --git a/Beef/ari_core/BeefProj.toml b/Beef/ari_core/BeefProj.toml
@@ -7,3 +7,6 @@ StartupObject = "ari_core.Program"
 
 [Configs.Debug.Win64]
 LibPaths = ["$(ProjectDir)/../dist/win64/Debug/cari_core.lib", "$(ProjectDir)/../dist/win64/Debug/sx.lib", "$(ProjectDir)/../dist/win64/Debug/ari_core.lib", "$(ProjectDir)/../dist/win64/Debug/memory-allocators.lib"]
+
+[Configs.Release.Win64]
+LibPaths = ["$(ProjectDir)/../dist/win64/Release/cari_core.lib", "$(ProjectDir)/../dist/win64/Release/sx.lib", "$(ProjectDir)/../dist/win64/Release/ari_core.lib", "$(ProjectDir)/../dist/win64/Release/memory-allocators.lib"]
diff --git a/Beef/ari_en/BeefProj.toml b/Beef/ari_en/BeefProj.toml
@@ -8,3 +8,6 @@ StartupObject = "ari_en.Program"
 
 [Configs.Debug.Win64]
 LibPaths = ["$(ProjectDir)/../dist/win64/Debug/cari_en.lib", "$(ProjectDir)/../dist/win64/Debug/ari_en.lib", "$(ProjectDir)/../dist/win64/Debug/yojimbo.lib", "$(ProjectDir)/../dist/win64/Debug/mbedcrypto.lib", "$(ProjectDir)/../dist/win64/Debug/mbedtls.lib", "$(ProjectDir)/../dist/win64/Debug/mbedx509.lib", "$(ProjectDir)/../dist/win64/Debug/sodium.lib"]
+
+[Configs.Release.Win64]
+LibPaths = ["$(ProjectDir)/../dist/win64/Release/cari_en.lib", "$(ProjectDir)/../dist/win64/Release/ari_en.lib", "$(ProjectDir)/../dist/win64/Release/yojimbo.lib", "$(ProjectDir)/../dist/win64/Release/mbedcrypto.lib", "$(ProjectDir)/../dist/win64/Release/mbedtls.lib", "$(ProjectDir)/../dist/win64/Release/mbedx509.lib", "$(ProjectDir)/../dist/win64/Release/sodium.lib"]
diff --git a/Beef/ari_gfx/BeefProj.toml b/Beef/ari_gfx/BeefProj.toml
@@ -9,3 +9,5 @@ StartupObject = "ari_gfx.Program"
 [Configs.Debug.Win64]
 LibPaths = ["$(ProjectDir)/../dist/win64/Debug/cari_gfx.lib", "$(ProjectDir)/../dist/win64/Debug/ari_gfx.lib", "$(ProjectDir)/../dist/win64/Debug/glfw3.lib", "opengl32.lib", "gdi32.lib", "shell32.lib"]
 
+[Configs.Release.Win64]
+LibPaths = ["$(ProjectDir)/../dist/win64/Release/cari_gfx.lib", "$(ProjectDir)/../dist/win64/Release/ari_gfx.lib", "$(ProjectDir)/../dist/win64/Release/glfw3.lib", "opengl32.lib", "gdi32.lib", "shell32.lib"]
diff --git a/Beef/ari_gui/BeefProj.toml b/Beef/ari_gui/BeefProj.toml
@@ -9,3 +9,6 @@ DefaultNamespace = "ari.gui"
 
 [Configs.Debug.Win64]
 LibPaths = ["$(ProjectDir)/../dist/win64/Debug/cari_gui.lib", "$(ProjectDir)/../dist/win64/Debug/ari_gui.lib", "$(ProjectDir)/../dist/win64/Debug/cimgui.lib"]
+
+[Configs.Release.Win64]
+LibPaths = ["$(ProjectDir)/../dist/win64/Release/cari_gui.lib", "$(ProjectDir)/../dist/win64/Release/ari_gui.lib", "$(ProjectDir)/../dist/win64/Release/cimgui.lib"]
diff --git a/Beef/ari_io/BeefProj.toml b/Beef/ari_io/BeefProj.toml
@@ -8,3 +8,6 @@ StartupObject = "ari_io.Program"
 
 [Configs.Debug.Win64]
 LibPaths = ["$(ProjectDir)/../dist/win64/Debug/cari_io.lib", "$(ProjectDir)/../dist/win64/Debug/ari_io.lib", "$(ProjectDir)/../dist/win64/Debug/ari_fs_local.lib"]
+
+[Configs.Release.Win64]
+LibPaths = ["$(ProjectDir)/../dist/win64/Release/cari_io.lib", "$(ProjectDir)/../dist/win64/Release/ari_io.lib", "$(ProjectDir)/../dist/win64/Release/ari_fs_local.lib"]
diff --git a/Beef/ari_net/BeefProj.toml b/Beef/ari_net/BeefProj.toml
@@ -9,3 +9,6 @@ DefaultNamespace = "ari.net"
 
 [Configs.Debug.Win64]
 LibPaths = ["$(ProjectDir)/../dist/win64/Debug/cari_net.lib", "$(ProjectDir)/../dist/win64/Debug/ari_net.lib"]
+
+[Configs.Release.Win64]
+LibPaths = ["$(ProjectDir)/../dist/win64/Release/cari_net.lib", "$(ProjectDir)/../dist/win64/Release/ari_net.lib"]
diff --git a/Beef/ari_net_3d/BeefProj.toml b/Beef/ari_net_3d/BeefProj.toml
@@ -8,3 +8,6 @@ StartupObject = "ari_net_3d.Program"
 
 [Configs.Debug.Win64]
 LibPaths = ["$(ProjectDir)/../dist/win64/Debug/cari_net_3d.lib"]
+
+[Configs.Release.Win64]
+LibPaths = ["$(ProjectDir)/../dist/win64/Release/cari_net_3d.lib"]
diff --git a/Beef/deps/imgui-beef b/Beef/deps/imgui-beef
diff --git a/Beef/dist/copy_dll.bat b/Beef/dist/copy_dll.bat
@@ -1,5 +1,7 @@
 FOR /R "..\..\..\fips-build\ariyana\cari-win64-vstudio-debug\" %%i IN (*.lib) DO COPY "%%i" ".\win64\Debug\"
 
+FOR /R "..\..\..\fips-build\ariyana\cari-win64-vstudio-release\" %%i IN (*.lib) DO COPY "%%i" ".\win64\Release\"
+
 FOR /R "..\..\..\fips-build\ariyana\server-win64-vstudio-debug\" %%i IN (*.lib) DO COPY "%%i" ".\win64\ServerDebug\"
 
 FOR /R "..\..\..\fips-build\ariyana\server-linux-ninja-debug\" %%i IN (*.a) DO COPY "%%i" ".\linux64\ServerDebug\"
diff --git a/Beef/dist/win64/Release/holder.txt b/Beef/dist/win64/Release/holder.txt
diff --git a/fips-files/include.cmake b/fips-files/include.cmake
@@ -88,9 +88,6 @@ macro(ari_setup)
         if (FIPS_WIN64)
             add_definitions(-DARI_WIN64=1)
         endif()
-        if (FIPS_MSVC)
-            add_compile_options ("/ZI")
-        endif()
     endif()
 
 endmacro()