YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on fixing stb

Browse Source
This commit is contained in:
Dominic Masters
2021-09-30 11:44:58 -07:00
parent fd6b9e5c84
commit 7ce46d3e44
7 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -7,6 +7,7 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD_REQUIRED ON)
project(Dawn VERSION 1.0)
set(GAME_NAME DawnGame) set(GAME_NAME DawnGame)
set(GAME_VERSION 1.0) set(GAME_VERSION 1.0)

8
client/glfw/CMakeLists.txt
View File

@ -3,10 +3,8 @@
# This software is released under the MIT License. # This software is released under the MIT License.
# https://opensource.org/licenses/MIT # https://opensource.org/licenses/MIT
project(${GAME_NAME} VERSION ${GAME_VERSION}) file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
file(GLOB_RECURSE HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
file(GLOB_RECURSE SOURCES ${CMAKE_SOURCE_DIR}/*.c)
file(GLOB_RECURSE HEADERS ${CMAKE_SOURCE_DIR}/*.h)
add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES}) add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES})
target_link_libraries(${PROJECT_NAME} src glfw) target_link_libraries(${PROJECT_NAME} src glfw glad_gl_core_33)

3
client/glfw/glwfwplatform.c
View File

@ -27,7 +27,8 @@ int32_t main() {
// Load GLAD // Load GLAD
glfwMakeContextCurrent(window); glfwMakeContextCurrent(window);
glfwSwapInterval(0); glfwSwapInterval(0);
gladLoadGLLoader((GLADloadproc) glfwGetProcAddress); gladLoadGL((GLADloadfunc)glfwGetProcAddress);
// gladLoadGLLoader((GLADloadproc) glfwGetProcAddress);
// Setup window listeners // Setup window listeners
glfwSetWindowSizeCallback(window, &glfwOnResize); glfwSetWindowSizeCallback(window, &glfwOnResize);

10
client/glfw/glwfwplatform.h
View File

@ -4,10 +4,12 @@
// https://opensource.org/licenses/MIT // https://opensource.org/licenses/MIT
#pragma once #pragma once
#include <src/libs.h> #include <glad/gl.h>
#include "src/display/render.h" #include <GLFW/glfw3.h>
#include "src/game/game.h" #include <libs.h>
#include "src/input/input.h" #include <display/render.h>
#include <game/game.h>
#include <input/input.h>
#define WINDOW_WIDTH_DEFAULT 1280 #define WINDOW_WIDTH_DEFAULT 1280
#define WINDOW_HEIGHT_DEFAULT WINDOW_WIDTH_DEFAULT/16*9 #define WINDOW_HEIGHT_DEFAULT WINDOW_WIDTH_DEFAULT/16*9

8
lib/CMakeLists.txt
View File

@ -3,15 +3,15 @@
# This software is released under the MIT License. # This software is released under the MIT License.
# https://opensource.org/licenses/MIT # https://opensource.org/licenses/MIT
add_subdirectory(Unity) #add_subdirectory(Unity)
add_subdirectory(cglm) add_subdirectory(cglm)
add_subdirectory(glfw) add_subdirectory(glfw)
add_subdirectory(duktape) add_subdirectory(duktape)
# STB # STB
add_library(stb STATIC stb/stb_image.h) file(GLOB_RECURSE STB_SOURCES stb/*.h)
set_target_properties(stb PROPERTIES LINKER_LANGUAGE C) add_library(stb INTERFACE)
target_include_directories(stb PUBLIC stb/) target_include_directories(stb INTERFACE stb)
# GLAD # GLAD
add_subdirectory(glad2/cmake) add_subdirectory(glad2/cmake)

4
src/CMakeLists.txt
View File

@ -8,12 +8,10 @@ file(GLOB_RECURSE SOURCES *.c)
add_library(src STATIC ${SOURCES}) add_library(src STATIC ${SOURCES})
target_include_directories(src PUBLIC ${CMAKE_CURRENT_LIST_DIR}) target_include_directories(src PUBLIC ${CMAKE_CURRENT_LIST_DIR})
target_link_libraries(src PUBLIC target_link_libraries(src PUBLIC
glfw
cglm
stb
cglm cglm
duktape duktape
glad_gl_core_33 glad_gl_core_33
stb
) )
# Set up flags # Set up flags

8
src/libs.h
View File

@ -7,7 +7,6 @@
// Static Libs // Static Libs
#include <glad/gl.h> #include <glad/gl.h>
#include <GLFW/glfw3.h>
#include <duktape.h> #include <duktape.h>
#include <cglm/cglm.h> #include <cglm/cglm.h>
#include <stb_image.h> #include <stb_image.h>
@ -26,12 +25,7 @@
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
// Windows Fixes // Windows Fixes
# define strtok_r strtok_s # define strtok_r strtok_s
# define sleep(n) Sleep(n)
#if defined(Sleep)
# define sleep(n) Sleep(n)
#else
# define sleep(n) _sleep(n)
#endif
#else #else
// Unix Fixes // Unix Fixes
#include <unistd.h> #include <unistd.h>