AlexVinS 9 anni fa
parent
commit
36c44c2ce7
5 ha cambiato i file con 8 aggiunte e 1 eliminazioni
  1. 1 0
      client/VCMI_client.cbp
  2. 3 0
      lib/VCMI_lib.cbp
  3. 1 0
      scripting/erm/ERM.cbp
  4. 1 0
      server/VCMI_server.cbp
  5. 2 1
      test/Test.cbp

+ 1 - 0
client/VCMI_client.cbp

@@ -78,6 +78,7 @@
 			<Add directory="../client" />
 			<Add directory="$(#ffmpeg.include)" />
 			<Add directory="$(#sdl2.include)" />
+			<Add directory="../include" />
 		</Compiler>
 		<Linker>
 			<Add option="-lole32" />

+ 3 - 0
lib/VCMI_lib.cbp

@@ -113,12 +113,15 @@
 			<Add directory="." />
 			<Add directory="$(#sdl2.include)" />
 			<Add directory="$(#zlib.include)" />
+			<Add directory="../include" />
 		</Compiler>
 		<Linker>
 			<Add directory="../" />
 			<Add directory="$(#sdl2.lib)" />
 			<Add directory="$(#zlib.lib)" />
 		</Linker>
+		<Unit filename="../Global.h" />
+		<Unit filename="../include/vstd/LogFormat.h" />
 		<Unit filename="AI_Base.h" />
 		<Unit filename="BattleAction.cpp" />
 		<Unit filename="BattleAction.h" />

+ 1 - 0
scripting/erm/ERM.cbp

@@ -62,6 +62,7 @@
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
 			<Add directory="$(#boost.include)" />
+			<Add directory="../include" />
 		</Compiler>
 		<Linker>
 			<Add option="-lboost_program_options$(#boost.libsuffix)" />

+ 1 - 0
server/VCMI_server.cbp

@@ -74,6 +74,7 @@
 			<Add option="-D_WIN32" />
 			<Add directory="$(#sdl2.include)" />
 			<Add directory="$(#zlib.include)" />
+			<Add directory="../include" />
 		</Compiler>
 		<Linker>
 			<Add option="-lole32" />

+ 2 - 1
test/Test.cbp

@@ -9,8 +9,8 @@
 			<Target title="Debug-win32">
 				<Option platforms="Windows;" />
 				<Option output="../Test" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/x86/" />
 				<Option working_dir="../." />
+				<Option object_output="obj/Debug/x86/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -49,6 +49,7 @@
 			<Add option="-Wno-unused-local-typedefs" />
 			<Add directory="$(#zlib.include)" />
 			<Add directory="$(#boost.include)" />
+			<Add directory="../include" />
 		</Compiler>
 		<Linker>
 			<Add option="-lVCMI_lib" />