ed/HandmadeHero
1
0
Fork 0
mirror of https://github.com/Ed94/HandmadeHero.git synced 2024-09-20 03:47:32 -07:00
Code Issues Packages Projects Releases Wiki Activity

Got clang to build parity with msvc

Browse Source
This commit is contained in:
Edward R. Gonzalez 2023-10-24 00:42:55 -04:00
parent 4ab64e2c17
commit 2a660da1d8
8 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/bookmarks.json vendored
View File

@ -14,7 +14,7 @@
"label": "Static Data" "label": "Static Data"
}, },
{ {
"line": 1001, "line": 1011,
"column": 0, "column": 0,
"label": "Main Loop : End" "label": "Main Loop : End"
} }

4
.vscode/c_cpp_properties.json vendored
View File

@ -34,7 +34,9 @@
"UNICODE", "UNICODE",
"_UNICODE", "_UNICODE",
"GEN_TIME", "GEN_TIME",
"INTELLISENSE_DIRECTIVES" "INTELLISENSE_DIRECTIVES",
"Build_Debug",
"Build_Development"
], ],
"windowsSdkVersion": "10.0.22621.0", "windowsSdkVersion": "10.0.22621.0",
"compilerPath": "clang.exe", "compilerPath": "clang.exe",

2
project/engine/engine.cpp
View File

@ -1058,7 +1058,7 @@ void update_and_render( f32 delta_time, InputState* input, OffscreenBuffer* back
s32 tile_id = TileMap_get_tile_value( tile_map, col, row, game_state->camera_pos.tile_z ); s32 tile_id = TileMap_get_tile_value( tile_map, col, row, game_state->camera_pos.tile_z );
f32 color[3] = { 0.15f, 0.15f, 0.15f }; f32 color[3] = { 0.15f, 0.15f, 0.15f };
if ( tile_id > 1 || row == player->position.tile_y && col == player->position.tile_x ) if ( tile_id > 1 || (row == player->position.tile_y && col == player->position.tile_x) )
// if ( tile_id > 1 ) // if ( tile_id > 1 )
{ {
if ( tile_id == 2 ) if ( tile_id == 2 )

1
project/platform/compiler_ignores.hpp
View File

@ -27,4 +27,5 @@
#pragma clang diagnostic ignored "-Wvarargs" #pragma clang diagnostic ignored "-Wvarargs"
#pragma clang diagnostic ignored "-Wunused-function" #pragma clang diagnostic ignored "-Wunused-function"
#pragma clang diagnostic ignored "-Wunused-but-set-variable" #pragma clang diagnostic ignored "-Wunused-but-set-variable"
#pragma clang diagnostic ignored "-Wmissing-braces"
#endif #endif

10
project/platform/win32/win32_platform.cpp
View File

@ -503,6 +503,9 @@ engine::ModuleAPI load_engine_module_api()
{ {
OutputDebugStringA( "Loaded engine module API\n" ); OutputDebugStringA( "Loaded engine module API\n" );
} }
else {
fatal( "Failed to load engine module API!\n" );
}
return engine_api; return engine_api;
} }
@ -865,6 +868,13 @@ WinMain( HINSTANCE instance, HINSTANCE prev_instance, LPSTR commandline, int sho
} }
} }
// Populate an initial polling state for the inputs
poll_input( window_handle, & input, jsl_num_devices, jsl_device_handles
, old_keyboard, new_keyboard
, old_mouse, new_mouse
, old_xpads, new_xpads
, old_ds_pads, new_ds_pads );
engine_api.startup( rcast(engine::OffscreenBuffer*, & Surface_Back_Buffer.memory), & engine_memory, & platform_api ); engine_api.startup( rcast(engine::OffscreenBuffer*, & Surface_Back_Buffer.memory), & engine_memory, & platform_api );
u64 last_frame_clock = timing_get_wall_clock(); u64 last_frame_clock = timing_get_wall_clock();

8
project/platform/win32/win32_platform_api.cpp
View File

@ -2,6 +2,10 @@
#include "platform.hpp" #include "platform.hpp"
#include "jsl.hpp" #include "jsl.hpp"
#include "win32.hpp" #include "win32.hpp"
NS_PLATFORM_BEGIN
using namespace win32;
NS_PLATFORM_END
#endif #endif
NS_PLATFORM_BEGIN NS_PLATFORM_BEGIN
@ -127,8 +131,10 @@ b32 file_read_content( File* file )
return {}; return {};
} }
// This has to be done or for some reason file_handle will be consumed to null by `GetFileSizeEx` (Clang bug?)
HANDLE file_handle_clang_bug = file_handle;
u32 size; u32 size;
GetFileSizeEx( file_handle, rcast(LARGE_INTEGER*, &size) ); GetFileSizeEx( file_handle_clang_bug, rcast(LARGE_INTEGER*, &size) );
if ( size == 0 ) if ( size == 0 )
{ {
// TODO(Ed) : Logging // TODO(Ed) : Logging

4
scripts/build.ps1
View File

@ -250,10 +250,10 @@ function build-engine
$local:compiler_args = $script:compiler_args $local:compiler_args = $script:compiler_args
$compiler_args += ($flag_define + 'Build_DLL=1' ) $compiler_args += ($flag_define + 'Build_DLL=1' )
if ( $vendor -eq 'msvc' ) { if ( $IsWindows ) {
$compiler_args += ($flag_define + 'Engine_API=__declspec(dllexport)') $compiler_args += ($flag_define + 'Engine_API=__declspec(dllexport)')
} }
if ( $vendor -eq 'clang' ) { else {
$compiler_args += ($flag_define + 'Engine_API=__attribute__((visibility("default")))') $compiler_args += ($flag_define + 'Engine_API=__attribute__((visibility("default")))')
} }