Skip to content

Commit ee08179

Browse files
merge the opengl and buffer rendering versions
1 parent 1fb9a81 commit ee08179

File tree

11 files changed

+24
-484
lines changed

11 files changed

+24
-484
lines changed

.github/workflows/linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ jobs:
6767
- name: Generate Artifacts
6868
run: |
6969
cp -v -r ./RGFW/ ./build/${{ env.RELEASE_NAME }}/
70-
cp -v -r ./RGFW-buffer/ ./build/${{ env.RELEASE_NAME }}/
7170
cp -v ./README.md ./build/${{ env.RELEASE_NAME }}/README.md
7271
cd build
7372
tar -czvf ${{ env.RELEASE_NAME }}.tar.gz ${{ env.RELEASE_NAME }}

Makefile

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,18 @@ endif
3535

3636
all:
3737
make RGFW/libRGFW$(LIB_EXT)
38-
make RGFW-buffer/libRGFW$(LIB_EXT)
3938
$(ODIN) build basic.odin -file
4039
$(ODIN) build basic-buffer.odin -file
4140

4241
build-RGFW:
43-
make RGFW/libRGFW$(LIB_EXT)
44-
make RGFW-buffer/libRGFW$(LIB_EXT)
42+
make RGFW/libRGFW$(LIB_EXT)
4543

4644
clean:
4745
rm -f libRGFW.so libRGFW.dll libRGFW.dylib RGFW.o
4846

4947
debug:
5048
make clean
5149
make RGFW/libRGFW$(LIB_EXT)
52-
make RGFW-buffer/libRGFW$(LIB_EXT)
5350
$(ODIN) run basic.odin -file
5451
$(ODIN) run basic-buffer.odin -file
5552

@@ -62,22 +59,14 @@ Odin/odin:
6259

6360
RGFW/RGFW.h:
6461
curl -o RGFW/RGFW.h https://raw.githubusercontent.com/ColleagueRiley/RGFW/main/RGFW.h
65-
cp RGFW/RGFW.h ./RGFW-buffer
6662

6763
RGFW/RGFW.o:
6864
make RGFW/RGFW.h
69-
$(CC) $(CUSTOM_CFLAGS) -x c -c RGFW/RGFW.h -D RGFW_IMPLEMENTATION -D RGFW_NO_JOYSTICK_CODES -fPIC -o RGFW/RGFW.o
70-
71-
RGFW-buffer/RGFW.o:
72-
$(CC) $(CUSTOM_CFLAGS) -x c -c RGFW-buffer/RGFW.h -D RGFW_BUFFER -D RGFW_OPENGL -D RGFW_IMPLEMENTATION -D RGFW_NO_JOYSTICK_CODES -fPIC -o RGFW-buffer/RGFW.o
65+
$(CC) $(CUSTOM_CFLAGS) -x c -c RGFW/RGFW.h -D RGFW_OPENGL -D RGFW_BUFFER -D RGFW_IMPLEMENTATION -D RGFW_NO_JOYSTICK_CODES -fPIC -o RGFW/RGFW.o
7366

7467
RGFW/libRGFW$(LIB_EXT):
7568
make RGFW/RGFW.o
7669
$(CC) $(CUSTOM_CFLAGS) -shared RGFW/RGFW.o $(LIBS) -o RGFW/libRGFW$(LIB_EXT)
7770

78-
RGFW-buffer/libRGFW$(LIB_EXT):
79-
make RGFW-buffer/RGFW.o
80-
$(CC) $(CUSTOM_CFLAGS) -shared RGFW-buffer/RGFW.o $(LIBS) -o RGFW-buffer/libRGFW$(LIB_EXT)
81-
8271
clean:
83-
rm -f RGFW/RGFW.h RGFW-buffer/RGFW.h RGFW/RGFW.o RGFW-buffer/RGFW.o RGFW/libRGFW$(LIB_EXT) RGFW-buffer/libRGFW$(LIB_EXT)
72+
rm -f RGFW/RGFW.h RGFW/RGFW.o RGFW/libRGFW$(LIB_EXT)

0 commit comments

Comments
 (0)