linkse100241/prog3b_652
2
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'Project_Developer'

Browse Source
This commit is contained in:
Severin Link 2025-12-01 12:06:01 +01:00
commit 84b469b454
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -33,7 +33,6 @@ if(WIN32)
message(STATUS "Configuring for Windows") message(STATUS "Configuring for Windows")
target_link_libraries(${EXECUTABLE_NAME} PRIVATE target_link_libraries(${EXECUTABLE_NAME} PRIVATE
${CMAKE_CURRENT_LIST_DIR}/windows/libgamematrix.a
${CMAKE_CURRENT_LIST_DIR}/windows/libraylib.a ${CMAKE_CURRENT_LIST_DIR}/windows/libraylib.a
opengl32 gdi32 winmm opengl32 gdi32 winmm
) )
@ -42,7 +41,6 @@ elseif(APPLE)
message(STATUS "Configuring for MacOS") message(STATUS "Configuring for MacOS")
target_link_libraries(${EXECUTABLE_NAME} PRIVATE target_link_libraries(${EXECUTABLE_NAME} PRIVATE
${CMAKE_CURRENT_LIST_DIR}/mac_x86/libgamematrix.a
${CMAKE_CURRENT_LIST_DIR}/mac_x86/libraylib.a ${CMAKE_CURRENT_LIST_DIR}/mac_x86/libraylib.a
"-framework IOKit" "-framework IOKit"
"-framework Cocoa" "-framework Cocoa"
@ -52,7 +50,6 @@ else()
# --- Linux --- # --- Linux ---
message(STATUS "Configuring for Linux") message(STATUS "Configuring for Linux")
target_link_libraries(${EXECUTABLE_NAME} PRIVATE target_link_libraries(${EXECUTABLE_NAME} PRIVATE
${CMAKE_CURRENT_LIST_DIR}/linux/libgamematrix.a
${CMAKE_CURRENT_LIST_DIR}/linux/libraylib.a ${CMAKE_CURRENT_LIST_DIR}/linux/libraylib.a
GL X11 m GL X11 m
) )

2
src/main.cpp
View File

@ -1,7 +1,7 @@
#include "gamecube.h" #include "gamecube.h"
#include <algorithm> #include <algorithm>
#include <ctime> #include <ctime>
//Funktion innitGame //Funktion innitGame
//Anzahl der Paare(pairCount*2) //Anzahl der Paare(pairCount*2)
void innitGame(int pairCount, void innitGame(int pairCount,
std::vector<gamecube> &cubes, std::vector<gamecube> &cubes,

BIN
windows/libgamematrix.a
View File

Binary file not shown.