summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Tenenbaum <pommicket@gmail.com>2020-12-13 12:23:06 -0500
committerLeo Tenenbaum <pommicket@gmail.com>2020-12-13 12:23:06 -0500
commitb36b0f8fa135beee0a50f16298692c1e076fa9b0 (patch)
treea13483780b8eb2a078d3749cdde27ebdbd5dbc5f
parent34652cf2aa47a55bea07ac78d2864c556cb9cad7 (diff)
exe icon
-rw-r--r--.gitignore1
-rw-r--r--assets/icon.bmpbin16522 -> 2442 bytes
-rw-r--r--assets/icon.icobin0 -> 1406 bytes
-rw-r--r--boxcatapult2d.rc1
-rw-r--r--make.bat10
-rw-r--r--util.cpp3
6 files changed, 10 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index e308a5c..23d9f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ TAGS
*.xcf
*.lib
*.exp
+*.res
SDL2
box2d
.vs*
diff --git a/assets/icon.bmp b/assets/icon.bmp
index 1c487a2..1775fb8 100644
--- a/assets/icon.bmp
+++ b/assets/icon.bmp
Binary files differ
diff --git a/assets/icon.ico b/assets/icon.ico
new file mode 100644
index 0000000..07b4999
--- /dev/null
+++ b/assets/icon.ico
Binary files differ
diff --git a/boxcatapult2d.rc b/boxcatapult2d.rc
new file mode 100644
index 0000000..cd4466b
--- /dev/null
+++ b/boxcatapult2d.rc
@@ -0,0 +1 @@
+icon ICON assets\icon.ico
diff --git a/make.bat b/make.bat
index 4fdc115..74c3851 100644
--- a/make.bat
+++ b/make.bat
@@ -6,10 +6,10 @@ if _%VCVARS% == _ (
if not exist obj mkdir obj
SET CFLAGS=/nologo /W3 /D_CRT_SECURE_NO_WARNINGS /I SDL2/include /I box2d SDL2/lib/x64/SDL2main.lib SDL2/lib/x64/SDL2.lib opengl32.lib box2d.lib /MD
+rc /nologo boxcatapult2d.rc
if _%1 == _ (
- cl main.cpp /DDEBUG /DEBUG /Zi %CFLAGS% /Fo:obj/urbs /Fe:physics
- cl sim.cpp /DDEBUG /DEBUG /LD %CFLAGS% /Fo:obj/sim /Fe:obj/sim
- echo > obj\sim.dll_changed
+ cl main.cpp /DDEBUG /DEBUG /Zi %CFLAGS% /Fo:obj/urbs /Fe:boxcatapult2d boxcatapult2d.res
+ rem cl sim.cpp /DDEBUG /DEBUG /LD %CFLAGS% /Fo:obj/sim /Fe:obj/sim
+ rem echo > obj\sim.dll_changed
)
-if _%1 == _release cl main.cpp /O2 %CFLAGS% /Fe:physics
-if _%1 == _profile cl main.cpp /O2 /DPROFILE %CFLAGS% /Fe:physics
+if _%1 == _release cl main.cpp /O2 %CFLAGS% /Fe:boxcatapult2d boxcatapult2d.res
diff --git a/util.cpp b/util.cpp
index 99aed75..4662724 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,3 +1,6 @@
+#if _WIN32
+#include <direct.h>
+#endif
#ifndef arr_count
#define arr_count(a) (sizeof (a) / sizeof *(a))
#endif