no need to use juliet obj everywhere, compile the dll directly
This commit is contained in:
+17
-19
@@ -205,7 +205,7 @@ echo ===========================================================================
|
||||
if not exist "bin\x64-!CFG!" mkdir "bin\x64-!CFG!"
|
||||
if not exist "Intermediate\x64-!CFG!" mkdir "Intermediate\x64-!CFG!"
|
||||
|
||||
set COMMON_FLAGS=/nologo /std:c++20 /W4 /EHa- /utf-8 /DUNICODE /D_UNICODE /DWIN32_LEAN_AND_MEAN /D_CRT_SECURE_NO_WARNINGS /I"Juliet/include" /I"Juliet/src" /I"Game" /I"External/imgui" /I"External/imgui/backends" /DJULIET_WIN32 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 /wd4626 /wd5026 /wd5027 /wd4530 /Fd"Intermediate\x64-!CFG!\vc140.pdb"
|
||||
set COMMON_FLAGS=/nologo /std:c++20 /W4 /EHa- /utf-8 /DUNICODE /D_UNICODE /DWIN32_LEAN_AND_MEAN /D_CRT_SECURE_NO_WARNINGS /I"Juliet/include" /I"Juliet/src" /I"Game" /I"External/imgui" /I"External/imgui/backends" /DJULIET_WIN32 /wd5267 /wd4061 /wd4505 /wd4514 /wd4577 /wd4625 /wd4710 /wd4711 /wd4746 /wd4820 /wd5045 /wd5220 /wd5245 /wd4626 /wd5026 /wd5027 /wd4530
|
||||
|
||||
if /i "!CFG!"=="Debug" (
|
||||
set COMPILER_FLAGS=!COMMON_FLAGS! /MDd /Od /Zi /Gw /Gy /Zc:inline /DDEBUG /DPROFILING_ENABLED /DJULIET_ENABLE_IMGUI /DJULIET_DEBUG
|
||||
@@ -223,16 +223,16 @@ set COMMON_LIBS=kernel32.lib user32.lib gdi32.lib dxguid.lib Ws2_32.lib dxgi.lib
|
||||
:: --- Juliet Shared Objs ---
|
||||
echo.
|
||||
echo --- Compiling Shared Object Files (Juliet / ImGui) [%CFG%] ---
|
||||
if !JULIET_NEED_COMPILE! equ 0 (
|
||||
echo [SKIP / UP-TO-DATE] Intermediate\x64-!CFG!\Juliet_Unity*.obj [Unity files unchanged]
|
||||
) else (
|
||||
echo [REBUILDING] Compiling Intermediate\x64-!CFG!\Juliet_Unity*.obj...
|
||||
"%CHECK_TOOL%" start_step "Compiling Juliet Shared Objs [!CFG!]"
|
||||
%COMPILER% %COMPILER_FLAGS% /DJULIET_EXPORT /c Intermediate\Juliet\*.cpp /Fo"Intermediate\x64-!CFG!\\"
|
||||
set "COMP_ERR=!ERRORLEVEL!"
|
||||
"%CHECK_TOOL%" end_step
|
||||
if !COMP_ERR! neq 0 exit /b !COMP_ERR!
|
||||
)
|
||||
:: if !JULIET_NEED_COMPILE! equ 0 (
|
||||
:: echo [SKIP / UP-TO-DATE] Intermediate\x64-!CFG!\Juliet_Unity*.obj [Unity files unchanged]
|
||||
:: ) else (
|
||||
:: echo [REBUILDING] Compiling Intermediate\x64-!CFG!\Juliet_Unity*.obj...
|
||||
:: "%CHECK_TOOL%" start_step "Compiling Juliet Shared Objs [!CFG!]"
|
||||
:: %COMPILER% %COMPILER_FLAGS% /DJULIET_EXPORT /c Intermediate\Juliet\*.cpp /Fo"Intermediate\x64-!CFG!\\"
|
||||
:: set "COMP_ERR=!ERRORLEVEL!"
|
||||
:: "%CHECK_TOOL%" end_step
|
||||
:: if !COMP_ERR! neq 0 exit /b !COMP_ERR!
|
||||
:: )
|
||||
|
||||
:: --- ImGui Shared Objs ---
|
||||
if defined IMGUI_UNITY_SRCS (
|
||||
@@ -257,33 +257,31 @@ if !TARGET_JULIET! equ 1 set BUILD_GAME_DLL=1
|
||||
if !TARGET_GAME! equ 1 set BUILD_GAME_DLL=1
|
||||
|
||||
:: --- Juliet.dll ---
|
||||
if !TARGET_JULIET! equ 1 (
|
||||
call :link_target "Juliet.dll" "Building Juliet.dll [!CFG!]" "!JULIET_NEED_COMPILE!" "%COMPILER_FLAGS% /DJULIET_EXPORT /LD" "%JULIET_OBJS% %IMGUI_OBJS%" "/link %COMMON_LIBS% /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Juliet.ilk /PDB:Intermediate\x64-!CFG!\Juliet.pdb"
|
||||
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
|
||||
)
|
||||
call :link_target "Juliet.dll" "Building Juliet.dll [!CFG!]" "!JULIET_NEED_COMPILE!" "%COMPILER_FLAGS% /DJULIET_EXPORT /LD" "Intermediate\Juliet\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Juliet.ilk /PDB:Intermediate\x64-!CFG!\Juliet.pdb"
|
||||
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
|
||||
|
||||
:: --- Game.dll ---
|
||||
if !BUILD_GAME_DLL! equ 1 (
|
||||
call :link_target "Game.dll" "Building Game.dll [!CFG!]" "!GAME_NEED_COMPILE!" "%COMPILER_FLAGS% /DJULIET_EXPORT /LD" "Intermediate\Game\*.cpp %JULIET_OBJS% %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Game.ilk /PDB:Intermediate\x64-!CFG!\Game.pdb"
|
||||
call :link_target "Game.dll" "Building Game.dll [!CFG!]" "!GAME_NEED_COMPILE!" "%COMPILER_FLAGS% /DJULIET_EXPORT /LD" "Intermediate\Game\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Game.ilk /PDB:Intermediate\x64-!CFG!\Game.pdb"
|
||||
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
|
||||
)
|
||||
|
||||
:: --- JulietApp.exe ---
|
||||
if !TARGET_JULIET! equ 1 (
|
||||
call :link_target "JulietApp.exe" "Building JulietApp.exe [!CFG!]" "!JULIETAPP_NEED_COMPILE!" "%COMPILER_FLAGS%" "Intermediate\JulietApp\*.cpp %JULIET_OBJS% %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietApp.ilk /PDB:Intermediate\x64-!CFG!\JulietApp.pdb"
|
||||
call :link_target "JulietApp.exe" "Building JulietApp.exe [!CFG!]" "!JULIETAPP_NEED_COMPILE!" "%COMPILER_FLAGS%" "Intermediate\JulietApp\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietApp.ilk /PDB:Intermediate\x64-!CFG!\JulietApp.pdb"
|
||||
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
|
||||
)
|
||||
|
||||
:: --- Romeo.exe ---
|
||||
if !TARGET_ROMEO! equ 1 (
|
||||
call :link_target "Romeo.exe" "Building Romeo.exe [!CFG!]" "!ROMEO_NEED_COMPILE!" "%COMPILER_FLAGS%" "%JULIET_OBJS% Intermediate\Romeo\*.cpp" "/link %COMMON_LIBS% /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:\"Intermediate\x64-!CFG!\Romeo.ilk\" /PDB:\"Intermediate\x64-!CFG!\Romeo.pdb\""
|
||||
call :link_target "Romeo.exe" "Building Romeo.exe [!CFG!]" "!ROMEO_NEED_COMPILE!" "%COMPILER_FLAGS%" "Intermediate\Romeo\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Romeo.ilk /PDB:Intermediate\x64-!CFG!\Romeo.pdb"
|
||||
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
|
||||
)
|
||||
|
||||
:: --- JulietShaderCompiler.exe ---
|
||||
if !TARGET_SHADER! equ 1 (
|
||||
if exist "Intermediate\JulietShaderCompiler\*.cpp" (
|
||||
call :link_target "JulietShaderCompiler.exe" "Building JulietShaderCompiler.exe [!CFG!]" "!SHADER_NEED_COMPILE!" "%COMPILER_FLAGS% /I\"JulietShaderCompiler\"" "%JULIET_OBJS% Intermediate\JulietShaderCompiler\*.cpp" "/link %COMMON_LIBS% dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:\"Intermediate\x64-!CFG!\JulietShaderCompiler.ilk\" /PDB:\"Intermediate\x64-!CFG!\JulietShaderCompiler.pdb\""
|
||||
call :link_target "JulietShaderCompiler.exe" "Building JulietShaderCompiler.exe [!CFG!]" "!SHADER_NEED_COMPILE!" "%COMPILER_FLAGS% /IJulietShaderCompiler" "Intermediate\JulietShaderCompiler\*.cpp %IMGUI_OBJS%" "/link %COMMON_LIBS% dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb"
|
||||
if !ERRORLEVEL! neq 0 exit /b !ERRORLEVEL!
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user